Skip to content

Commit 9004ccc

Browse files
authored
Merge pull request #88 from t-ho/fix/docker-networking-and-ci-updates
Fix/docker networking and ci updates
2 parents 8cd8f73 + 68bcd48 commit 9004ccc

6 files changed

Lines changed: 169 additions & 165 deletions

File tree

.github/workflows/build.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x]
15+
node-version: [20.x]
1616

1717
services:
1818
mongo:
@@ -21,23 +21,23 @@ jobs:
2121
- 27017:27017
2222

2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2525
- name: Use Node.js ${{ matrix.node-version }}
26-
uses: actions/setup-node@v1
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: ${{ matrix.node-version }}
2929
- name: Cache Node.js modules
30-
uses: actions/cache@v1
30+
uses: actions/cache@v4
3131
with:
32-
path: ~/.npm
32+
path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
3333
key: ${{ runner.OS }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
3434
restore-keys: |
3535
${{ runner.OS }}-node-${{ matrix.node-version }}-
3636
${{ runner.OS }}-node-
3737
${{ runner.OS }}-
3838
39-
- run: npm install
40-
- run: npm test
39+
- run: yarn install
40+
- run: yarn test
4141
env:
4242
CI: true
4343
FACEBOOK_APP_ID: ${{ secrets.FACEBOOK_APP_ID }}
@@ -61,7 +61,7 @@ jobs:
6161

6262
steps:
6363
- name: Checkout
64-
uses: actions/checkout@v2
64+
uses: actions/checkout@v4
6565
- name: Prepare
6666
id: prep
6767
run: |
@@ -78,19 +78,19 @@ jobs:
7878
if [ "${{ github.event_name }}" = "push" ]; then
7979
TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
8080
fi
81-
echo ::set-output name=version::${VERSION}
82-
echo ::set-output name=tags::${TAGS}
83-
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
84-
echo ::set-output name=short_sha::${GITHUB_SHA::8}
81+
echo "version=${VERSION}" >> $GITHUB_OUTPUT
82+
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
83+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
84+
echo "short_sha=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
8585
- name: Set up Docker Buildx
86-
uses: docker/setup-buildx-action@v1
86+
uses: docker/setup-buildx-action@v3
8787
- name: Login to DockerHub
88-
uses: docker/login-action@v1
88+
uses: docker/login-action@v3
8989
with:
9090
username: ${{ secrets.DOCKER_USERNAME }}
9191
password: ${{ secrets.DOCKER_PASSWORD }}
9292
- name: Build and push
93-
uses: docker/build-push-action@v2
93+
uses: docker/build-push-action@v5
9494
with:
9595
context: .
9696
file: ./client/Dockerfile.prod
@@ -111,7 +111,7 @@ jobs:
111111

112112
steps:
113113
- name: Checkout
114-
uses: actions/checkout@v2
114+
uses: actions/checkout@v4
115115
- name: Prepare
116116
id: prep
117117
run: |
@@ -128,18 +128,18 @@ jobs:
128128
if [ "${{ github.event_name }}" = "push" ]; then
129129
TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
130130
fi
131-
echo ::set-output name=version::${VERSION}
132-
echo ::set-output name=tags::${TAGS}
133-
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
131+
echo "version=${VERSION}" >> $GITHUB_OUTPUT
132+
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
133+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
134134
- name: Set up Docker Buildx
135-
uses: docker/setup-buildx-action@v1
135+
uses: docker/setup-buildx-action@v3
136136
- name: Login to DockerHub
137-
uses: docker/login-action@v1
137+
uses: docker/login-action@v3
138138
with:
139139
username: ${{ secrets.DOCKER_USERNAME }}
140140
password: ${{ secrets.DOCKER_PASSWORD }}
141141
- name: Build and push
142-
uses: docker/build-push-action@v2
142+
uses: docker/build-push-action@v5
143143
with:
144144
context: .
145145
file: ./server/Dockerfile.prod
@@ -156,7 +156,7 @@ jobs:
156156

157157
steps:
158158
- name: Checkout
159-
uses: actions/checkout@v2
159+
uses: actions/checkout@v4
160160
- name: Prepare
161161
id: prep
162162
run: |
@@ -173,18 +173,18 @@ jobs:
173173
if [ "${{ github.event_name }}" = "push" ]; then
174174
TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
175175
fi
176-
echo ::set-output name=version::${VERSION}
177-
echo ::set-output name=tags::${TAGS}
178-
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
176+
echo "version=${VERSION}" >> $GITHUB_OUTPUT
177+
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
178+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
179179
- name: Set up Docker Buildx
180-
uses: docker/setup-buildx-action@v1
180+
uses: docker/setup-buildx-action@v3
181181
- name: Login to DockerHub
182-
uses: docker/login-action@v1
182+
uses: docker/login-action@v3
183183
with:
184184
username: ${{ secrets.DOCKER_USERNAME }}
185185
password: ${{ secrets.DOCKER_PASSWORD }}
186186
- name: Build and push
187-
uses: docker/build-push-action@v2
187+
uses: docker/build-push-action@v5
188188
with:
189189
context: .
190190
file: ./nginx-proxy/Dockerfile.prod

client/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM node:lts-buster
22
WORKDIR /mern-stack/client
3-
COPY ./client/package*.json ./
4-
RUN npm install
5-
CMD ["npm", "run", "start"]
3+
COPY ./client/package*.json ./client/yarn.lock ./
4+
RUN yarn install
5+
CMD ["yarn", "start"]

0 commit comments

Comments
 (0)