fix: http server replaced

bn-digital · Jul 5, 2023 · 02951b1 · 02951b1
1 parent c0e3d07
commit 02951b1
Show file tree

Hide file tree

Showing 12 changed files with 5,099 additions and 3,533 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -53,6 +53,21 @@ jobs:
           template: packages/website/.env.${{ inputs.env-template }}
           target: packages/website/.env.production
 
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            registry.infrastructure.svc.cluster.local:5000/${{ env.DOCKER_IMAGE }}
+            ${{ env.DOCKER_REPOSITORY }}/${{ env.DOCKER_IMAGE }}
+          labels: |
+            io.bndigital.dcr.environment=${{ env.APP_ENV }}
+            org.opencontainers.image.title=${{ env.APP_NAME }}
+            org.opencontainers.image.vendor=${{ github.repository_owner }}
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+          tags: |
+            type=raw,value=${{ env.APP_VERSION }}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -71,4 +86,9 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ env.DOCKER_REPOSITORY }}/${{ env.DOCKER_IMAGE }}:${{ env.APP_VERSION }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
+            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/packages/nodejs/Dockerfile b/packages/nodejs/Dockerfile
@@ -14,11 +14,11 @@ ENV NODE_NO_WARNINGS="1" \
     HOST="0.0.0.0" \
     PORT="5000"
 WORKDIR /usr/local/src
-RUN npm install --global pm2
+RUN npm install --global pm2 http-server
 USER node
 EXPOSE $PORT
 COPY --chown=node . .
-ENTRYPOINT ["pm2-runtime"]
-CMD ["ecosystem.config.yml"]
+ENTRYPOINT ["http-server"]
+CMD ["--proxy", "http://localhost:5000?"]
 
 FROM build
diff --git a/packages/nodejs/ecosystem.config.yml b/packages/nodejs/ecosystem.config.yml
@@ -11,4 +11,3 @@ apps:
     source_map_support: true
     exec_mode: cluster
     name: app
-
diff --git a/packages/yarn/app/.yarn/plugins/@yarnpkg/plugin-docker-build.cjs b/packages/yarn/app/.yarn/plugins/@yarnpkg/plugin-docker-build.cjs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ apps:
		source_map_support: true
		exec_mode: cluster
		name: app