Skip to content

Commit 89a2642

Browse files
committed
fix: move environment variables to build args in CI workflow and Dockerfile
1 parent 3ac112f commit 89a2642

File tree

2 files changed

+65
-22
lines changed

2 files changed

+65
-22
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,28 @@ jobs:
3434
context: .
3535
push: true
3636
tags: ghcr.io/3xcaffeine/${{ env.IMAGE_NAME }}:latest
37-
env:
38-
BETTER_AUTH_SECRET: ${{ secrets.BETTER_AUTH_SECRET }}
39-
BETTER_AUTH_URL: ${{ secrets.BETTER_AUTH_URL }}
40-
NEXT_PUBLIC_AUTH_URL: ${{ secrets.NEXT_PUBLIC_AUTH_URL }}
41-
DATABASE_URL: ${{ secrets.DATABASE_URL }}
42-
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
43-
GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
44-
PGHOST: ${{ secrets.PGHOST }}
45-
PGUSER: ${{ secrets.PGUSER }}
46-
PGPASSWORD: ${{ secrets.PGPASSWORD }}
47-
PGDATABASE: ${{ secrets.PGDATABASE }}
48-
PGPORT: ${{ secrets.PGPORT }}
49-
NEO4J_URI: ${{ secrets.NEO4J_URI }}
50-
NEO4J_USERNAME: ${{ secrets.NEO4J_USERNAME }}
51-
NEO4J_PASSWORD: ${{ secrets.NEO4J_PASSWORD }}
52-
NEO4J_DATABASE: ${{ secrets.NEO4J_DATABASE }}
53-
AURA_INSTANCEID: ${{ secrets.AURA_INSTANCEID }}
54-
AURA_INSTANCENAME: ${{ secrets.AURA_INSTANCENAME }}
55-
UPSTASH_REDIS_REST_URL: ${{ secrets.UPSTASH_REDIS_REST_URL }}
56-
UPSTASH_REDIS_REST_TOKEN: ${{ secrets.UPSTASH_REDIS_REST_TOKEN }}
57-
PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
58-
COUNTRY_CODE: ${{ secrets.COUNTRY_CODE }}
37+
build-args: |
38+
BETTER_AUTH_SECRET: ${{ secrets.BETTER_AUTH_SECRET }}
39+
BETTER_AUTH_URL: ${{ secrets.BETTER_AUTH_URL }}
40+
NEXT_PUBLIC_AUTH_URL: ${{ secrets.NEXT_PUBLIC_AUTH_URL }}
41+
DATABASE_URL: ${{ secrets.DATABASE_URL }}
42+
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
43+
GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
44+
PGHOST: ${{ secrets.PGHOST }}
45+
PGUSER: ${{ secrets.PGUSER }}
46+
PGPASSWORD: ${{ secrets.PGPASSWORD }}
47+
PGDATABASE: ${{ secrets.PGDATABASE }}
48+
PGPORT: ${{ secrets.PGPORT }}
49+
NEO4J_URI: ${{ secrets.NEO4J_URI }}
50+
NEO4J_USERNAME: ${{ secrets.NEO4J_USERNAME }}
51+
NEO4J_PASSWORD: ${{ secrets.NEO4J_PASSWORD }}
52+
NEO4J_DATABASE: ${{ secrets.NEO4J_DATABASE }}
53+
AURA_INSTANCEID: ${{ secrets.AURA_INSTANCEID }}
54+
AURA_INSTANCENAME: ${{ secrets.AURA_INSTANCENAME }}
55+
UPSTASH_REDIS_REST_URL: ${{ secrets.UPSTASH_REDIS_REST_URL }}
56+
UPSTASH_REDIS_REST_TOKEN: ${{ secrets.UPSTASH_REDIS_REST_TOKEN }}
57+
PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
58+
COUNTRY_CODE: ${{ secrets.COUNTRY_CODE }}
5959
6060
- name: Log out from GHCR
6161
run: docker logout

Dockerfile

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,49 @@ RUN bun install --frozen-lockfile
1414

1515
# Builder stage
1616
FROM oven/bun:1-alpine AS builder
17+
ARG BETTER_AUTH_SECRET
18+
ARG BETTER_AUTH_URL
19+
ARG NEXT_PUBLIC_AUTH_URL
20+
ARG DATABASE_URL
21+
ARG GOOGLE_CLIENT_ID
22+
ARG GOOGLE_CLIENT_SECRET
23+
ARG PGHOST
24+
ARG PGUSER
25+
ARG PGPASSWORD
26+
ARG PGDATABASE
27+
ARG PGPORT
28+
ARG NEO4J_URI
29+
ARG NEO4J_USERNAME
30+
ARG NEO4J_PASSWORD
31+
ARG NEO4J_DATABASE
32+
ARG AURA_INSTANCEID
33+
ARG AURA_INSTANCENAME
34+
ARG UPSTASH_REDIS_REST_URL
35+
ARG UPSTASH_REDIS_REST_TOKEN
36+
ARG PHONE_NUMBER
37+
ARG COUNTRY_CODE
38+
39+
ENV BETTER_AUTH_SECRET=$BETTER_AUTH_SECRET
40+
ENV BETTER_AUTH_URL=$BETTER_AUTH_URL
41+
ENV NEXT_PUBLIC_AUTH_URL=$NEXT_PUBLIC_AUTH_URL
42+
ENV DATABASE_URL=$DATABASE_URL
43+
ENV GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID
44+
ENV GOOGLE_CLIENT_SECRET=$GOOGLE_CLIENT_SECRET
45+
ENV PGHOST=$PGHOST
46+
ENV PGUSER=$PGUSER
47+
ENV PGPASSWORD=$PGPASSWORD
48+
ENV PGDATABASE=$PGDATABASE
49+
ENV PGPORT=$PGPORT
50+
ENV NEO4J_URI=$NEO4J_URI
51+
ENV NEO4J_USERNAME=$NEO4J_USERNAME
52+
ENV NEO4J_PASSWORD=$NEO4J_PASSWORD
53+
ENV NEO4J_DATABASE=$NEO4J_DATABASE
54+
ENV AURA_INSTANCEID=$AURA_INSTANCEID
55+
ENV AURA_INSTANCENAME=$AURA_INSTANCENAME
56+
ENV UPSTASH_REDIS_REST_URL=$UPSTASH_REDIS_REST_URL
57+
ENV UPSTASH_REDIS_REST_TOKEN=$UPSTASH_REDIS_REST_TOKEN
58+
ENV PHONE_NUMBER=$PHONE_NUMBER
59+
ENV COUNTRY_CODE=$COUNTRY_CODE
1760
WORKDIR /app
1861
COPY --from=deps /app/node_modules ./node_modules
1962
COPY . .

0 commit comments

Comments
 (0)