Update docker image, beta build scripts

apigee-internal · Aug 17, 2023 · 0f9efb0 · 0f9efb0
1 parent 01347fc
commit 0f9efb0
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 24 deletions.
diff --git a/kubernetes/docker/edgemicro/Dockerfile b/kubernetes/docker/edgemicro/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.19-buster-slim
+FROM node:18.17-buster-slim
 
 COPY installnode.sh /tmp
 COPY --chown=101:101 installedgemicro.sh /tmp

diff --git a/kubernetes/docker/edgemicro/Dockerfile.beta b/kubernetes/docker/edgemicro/Dockerfile.beta
@@ -1,25 +1,27 @@
-FROM node:8-alpine
+FROM node:18.17-buster-slim
 
-COPY install-beta.sh /tmp
+COPY installnode.sh /tmp
+COPY --chown=101:101 installedgemicro.sh /tmp
 
 # create user and group for microgateway
-RUN apk add --no-cache sed grep && \
-    addgroup -S apigee -g 101 && \
-    adduser -s /bin/bash -u 100 -S -G apigee apigee -h /opt/apigee
-
-WORKDIR /opt/apigee
-
-# copy entrypoint
-COPY entrypoint.sh /opt/apigee
+#RUN apk add --no-cache sed grep && \
+RUN addgroup --system --gid 101 apigee && \
+    adduser --shell /bin/bash --uid 101 --system --ingroup apigee --home /opt/apigee apigee
 
 ENV NODE_ENV production
 
-#install and initialize microgateway
-RUN chmod +x /tmp/install-beta.sh && \
-    /bin/bash /tmp/install-beta.sh && \
-    rm -f /tmp/install-beta.sh && \
-    deluser --remove-home node
+#install node.js
+RUN chmod +x /tmp/installnode.sh && \
+    apt-get update && \
+    apt-get install git -y && \
+    /bin/bash /tmp/installnode.sh && \
+    apt-get remove git -y && \
+    rm -f /tmp/installnode.sh &&\
+    userdel --remove node
 
+USER apigee
+WORKDIR /opt/apigee
+RUN mkdir /opt/apigee/.edgemicro && mkdir /opt/apigee/logs && mkdir /opt/apigee/plugins
 VOLUME /opt/apigee/.edgemicro
 VOLUME /opt/apigee/logs
 VOLUME /opt/apigee/plugins
@@ -28,8 +30,15 @@ VOLUME /opt/apigee/plugins
 # COPY key.pem /opt/apigee/.edgemicro
 # COPY cert.pem /opt/apigee/.edgemicro
 
+# copy entrypoint
+COPY --chown=101:101 entrypoint.sh /opt/apigee
+
+# initialize edgemicro
+RUN /bin/bash /tmp/installedgemicro.sh&& \
+    rm -f /tmp/installedgemicro.sh
+
 # Expose ports
 EXPOSE 8000
 EXPOSE 8443
-USER apigee
-ENTRYPOINT ["entrypoint"]
+
+ENTRYPOINT ["/opt/apigee/entrypoint.sh"]
diff --git a/kubernetes/docker/edgemicro/betabuild.sh b/kubernetes/docker/edgemicro/betabuild.sh
@@ -2,17 +2,29 @@
 
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo DIR is $DIR
 
-if [ $# -ne 1 ]; then 
-	echo "Please provide GCP project id"
+if [ $# -ne 2 ]; then
+	echo "Please provide edgemicro version and GCP project id"
         exit 1
 fi
 
-project_id=$1
+version=$1
+project_id=$2
 
-docker build -t edgemicro:beta $DIR -f Dockerfile.beta
+#us-west1-docker.pkg.dev/apigee-microgateway/edgemicro-beta
 
 if [ $# -eq 2 ]; then
-  docker tag edgemicro:$version gcr.io/$project_id/edgemicro:beta
-  docker push gcr.io/$project_id/edgemicro:beta
+
+  sed -i .bak  "s/ *edgemicro.*/ apigee-internal\/microgateway#$version/g" installnode.sh
+  docker build --no-cache -t edgemicro-beta:$version $DIR -f Dockerfile.beta
+  docker tag edgemicro-beta:$version us-west1-docker.pkg.dev/$project_id/edgemicro-beta/emg:$version
+  docker tag edgemicro-beta:$version us-west1-docker.pkg.dev/$project_id/edgemicro-beta/emg:beta
+  docker push us-west1-docker.pkg.dev/$project_id/edgemicro-beta/emg:$version
+  docker push us-west1-docker.pkg.dev/$project_id/edgemicro-beta/emg:beta
+  rm installnode.sh
+  mv installnode.sh.bak installnode.sh
+
 fi
+
+