Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/workflows/release-all-docker-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions web-integrations/google-secure-signals/client-side/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions web-integrations/google-secure-signals/server-side/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]