Merge branch 'main' into zhtw

goharbor · May 5, 2023 · 0f541a2 · 0f541a2
2 parents 0fb0823 + aaea068
commit 0f541a2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile
@@ -14,7 +14,7 @@ COPY ./make/photon/db/initial-registry.sql /docker-entrypoint-initdb.d/
 RUN chown -R postgres:postgres /docker-entrypoint.sh /docker-healthcheck.sh /docker-entrypoint-initdb.d \
     && chmod u+x /docker-entrypoint.sh /docker-healthcheck.sh
 
-ENTRYPOINT ["/docker-entrypoint.sh", "", "13"]
+ENTRYPOINT ["/docker-entrypoint.sh", "13", "14"]
 HEALTHCHECK CMD ["/docker-healthcheck.sh"]
 
-USER postgres
+USER postgres
diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base
@@ -2,16 +2,16 @@ FROM photon:4.0
 
 ENV PGDATA /var/lib/postgresql/data
 
-RUN tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \
+RUN tdnf install -y shadow gzip postgresql13 postgresql findutils bc >> /dev/null \
     && groupadd -r postgres --gid=999 \
     && useradd -m -r -g postgres --uid=999 postgres \
     && mkdir -p /docker-entrypoint-initdb.d \
     && mkdir -p /run/postgresql \
     && chown -R postgres:postgres /run/postgresql \
     && chmod 2777 /run/postgresql \
     && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \
-    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
-    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \
     && tdnf clean all
 
 RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools
diff --git a/make/photon/db/docker-entrypoint.sh b/make/photon/db/docker-entrypoint.sh
@@ -14,7 +14,7 @@ PGDATANEW=${PGDATA}/pg${PG_VERSION_NEW}
 
 # We should block the upgrade path from 9.6 directly.
 if [ -s $PGDATA/PG_VERSION ]; then
-        echo "Upgrading from PostgreSQL 9.6 to PostgreSQL $PG_VERSION_NEW is not supported in the current Harbor release."             
+        echo "Upgrading from PostgreSQL 9.6 to PostgreSQL $PG_VERSION_NEW is not supported in the current Harbor release."
         echo "You should upgrade to previous Harbor firstly, then upgrade to current release."
         exit 1
 fi
@@ -56,7 +56,7 @@ if [ ! -s $PGDATANEW/PG_VERSION ]; then
                 rm -rf $PGDATAOLD
         else
                 echo "init DB, DB version:$PG_VERSION_NEW"
-                initPG $PGDATANEW true 
+                initPG $PGDATANEW true
         fi
 fi
 

diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile
@@ -6,17 +6,15 @@ WORKDIR /build_dir
 
 ARG npm_registry=https://registry.npmjs.org
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends python-yaml
-
 COPY ./api/v2.0/swagger.yaml /build_dir/swagger.yaml
 COPY src/portal /build_dir
 
 ENV NPM_CONFIG_REGISTRY=${npm_registry}
 RUN npm install --unsafe-perm
 RUN npm run generate-build-timestamp
 RUN node --max_old_space_size=2048 'node_modules/@angular/cli/bin/ng' build --configuration production
-RUN python -c 'import sys, yaml, json; y=yaml.load(sys.stdin.read()); print json.dumps(y)' < swagger.yaml > dist/swagger.json
+RUN npm install js-yaml@4.1.0 \
+    && node -e "const yaml = require('js-yaml'); const fs = require('fs'); const swagger = yaml.load(fs.readFileSync('swagger.yaml', 'utf8')); fs.writeFileSync('swagger.json', JSON.stringify(swagger));"
 
 COPY ./LICENSE /build_dir/dist