From 12efdd1dd5439d34380ef25b8eab0b68418ab0ce Mon Sep 17 00:00:00 2001 From: scott sundahl Date: Mon, 24 Nov 2025 14:16:00 -0700 Subject: [PATCH] secure signals dockers --- .../workflows/release-all-docker-images.yaml | 39 +++++++++++++++++++ docker-compose.yml | 12 +++--- .../client-side/Dockerfile | 6 +-- .../react-client-side/Dockerfile | 4 +- .../server-side/Dockerfile | 8 ++-- 5 files changed, 54 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release-all-docker-images.yaml b/.github/workflows/release-all-docker-images.yaml index b6fc91b..c8f753f 100644 --- a/.github/workflows/release-all-docker-images.yaml +++ b/.github/workflows/release-all-docker-images.yaml @@ -44,4 +44,43 @@ jobs: docker_context: web-integrations/google-secure-signals/client-server docker_image_name: iabtechlab/uid2-google-secure-signals-client-server docker_registry: ghcr.io + secrets: inherit + + publishSecureSignalsClientSideImage: + uses: iabtechlab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v3 + needs: incrementVersionNumber + with: + new_version: ${{ needs.incrementVersionNumber.outputs.new_version }} + image_tag: ${{ needs.incrementVersionNumber.outputs.image_tag }} + release_type: ${{ inputs.release_type }} + docker_file: web-integrations/google-secure-signals/client-side/Dockerfile + docker_context: web-integrations/google-secure-signals/client-side + docker_image_name: iabtechlab/uid2-google-secure-signals-client-side + docker_registry: ghcr.io + secrets: inherit + + publishSecureSignalsServerSideImage: + uses: iabtechlab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v3 + needs: incrementVersionNumber + with: + new_version: ${{ needs.incrementVersionNumber.outputs.new_version }} + image_tag: ${{ needs.incrementVersionNumber.outputs.image_tag }} + release_type: ${{ inputs.release_type }} + docker_file: web-integrations/google-secure-signals/server-side/Dockerfile + docker_context: web-integrations/google-secure-signals/server-side + docker_image_name: iabtechlab/uid2-google-secure-signals-server-side + docker_registry: ghcr.io + secrets: inherit + + publishSecureSignalsReactClientSideImage: + uses: iabtechlab/uid2-shared-actions/.github/workflows/shared-publish-to-docker-versioned.yaml@v3 + needs: incrementVersionNumber + with: + new_version: ${{ needs.incrementVersionNumber.outputs.new_version }} + image_tag: ${{ needs.incrementVersionNumber.outputs.image_tag }} + release_type: ${{ inputs.release_type }} + docker_file: web-integrations/google-secure-signals/react-client-side/Dockerfile + docker_context: web-integrations/google-secure-signals/react-client-side + docker_image_name: iabtechlab/uid2-google-secure-signals-react-client-side + docker_registry: ghcr.io secrets: inherit \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 974d2ed..c44047f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,8 +65,8 @@ services: google-secure-signals-client-side: build: - context: . - dockerfile: web-integrations/google-secure-signals/client-side/Dockerfile + context: web-integrations/google-secure-signals/client-side + dockerfile: Dockerfile ports: - "3042:3042" container_name: google-secure-signals-client-side @@ -75,8 +75,8 @@ services: google-secure-signals-server-side: build: - context: . - dockerfile: web-integrations/google-secure-signals/server-side/Dockerfile + context: web-integrations/google-secure-signals/server-side + dockerfile: Dockerfile ports: - "3043:3043" container_name: google-secure-signals-server-side @@ -85,8 +85,8 @@ services: google-secure-signals-react-client-side: build: - context: . - dockerfile: web-integrations/google-secure-signals/react-client-side/Dockerfile + context: web-integrations/google-secure-signals/react-client-side + dockerfile: Dockerfile ports: - "3044:3044" container_name: google-secure-signals-react-client-side diff --git a/web-integrations/google-secure-signals/client-side/Dockerfile b/web-integrations/google-secure-signals/client-side/Dockerfile index 1cf6516..dbd5db0 100644 --- a/web-integrations/google-secure-signals/client-side/Dockerfile +++ b/web-integrations/google-secure-signals/client-side/Dockerfile @@ -4,11 +4,11 @@ FROM nginx:alpine RUN apk add --no-cache gettext # Copy static files from client-side directory -COPY web-integrations/google-secure-signals/client-side/html /usr/share/nginx/html/ +COPY html /usr/share/nginx/html/ # Copy config and entrypoint -COPY web-integrations/google-secure-signals/client-side/default.conf /etc/nginx/conf.d/default.conf -COPY web-integrations/google-secure-signals/client-side/entrypoint.sh /entrypoint.sh +COPY default.conf /etc/nginx/conf.d/default.conf +COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/web-integrations/google-secure-signals/react-client-side/Dockerfile b/web-integrations/google-secure-signals/react-client-side/Dockerfile index f51c77c..c9530ec 100644 --- a/web-integrations/google-secure-signals/react-client-side/Dockerfile +++ b/web-integrations/google-secure-signals/react-client-side/Dockerfile @@ -2,10 +2,10 @@ FROM node:20.11.0-alpine3.18 WORKDIR /usr/src/app -COPY web-integrations/google-secure-signals/react-client-side/package*.json ./ +COPY package*.json ./ RUN npm install -COPY web-integrations/google-secure-signals/react-client-side/ ./ +COPY . ./ EXPOSE 3044 ENV PORT=3044 diff --git a/web-integrations/google-secure-signals/server-side/Dockerfile b/web-integrations/google-secure-signals/server-side/Dockerfile index 01443b6..89a4c62 100644 --- a/web-integrations/google-secure-signals/server-side/Dockerfile +++ b/web-integrations/google-secure-signals/server-side/Dockerfile @@ -3,13 +3,13 @@ FROM node:20.11.0-alpine3.18 WORKDIR /usr/src/app # Copy package files first for better caching -COPY web-integrations/google-secure-signals/server-side/package*.json ./ +COPY package*.json ./ RUN npm install # Copy application files -COPY web-integrations/google-secure-signals/server-side/server.js ./ -COPY web-integrations/google-secure-signals/server-side/public ./public/ -COPY web-integrations/google-secure-signals/server-side/views ./views/ +COPY server.js ./ +COPY public ./public/ +COPY views ./views/ EXPOSE 3043 CMD ["npm", "start"] \ No newline at end of file