Skip to content
This repository was archived by the owner on Oct 20, 2024. It is now read-only.

Commit d18b953

Browse files
derogabderogab
authored
Merge pull request #474 from derogab/dev
v2.1.1
2 parents 24c0781 + 572ea85 commit d18b953

File tree

7 files changed

+2349
-1553
lines changed

7 files changed

+2349
-1553
lines changed

‎.github/dependabot.yml

+22
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,25 @@ updates:
3838
- 'derogab'
3939
labels:
4040
- 'dependencies'
41+
42+
# Maintain dependencies for Docker
43+
# in root folder
44+
- package-ecosystem: 'docker'
45+
directory: '/'
46+
target-branch: 'dev'
47+
schedule:
48+
interval: 'monthly'
49+
assignees:
50+
- 'derogab'
51+
labels:
52+
- 'dependencies'
53+
# and in /daemon folder
54+
- package-ecosystem: 'docker'
55+
directory: '/daemon'
56+
target-branch: 'dev'
57+
schedule:
58+
interval: 'monthly'
59+
assignees:
60+
- 'derogab'
61+
labels:
62+
- 'dependencies'

‎.github/workflows/docker-publish.yml

+45-143
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040

4141
- name: Run tests
4242
run: |
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353

5454
steps:
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656

5757
- name: Run tests
5858
run: |
@@ -63,102 +63,54 @@ jobs:
6363
docker build . --file Dockerfile
6464
fi
6565
66-
# Push daemon image to GitHub Packages.
67-
push-daemon-to-github-packages:
66+
# Push daemon image to registry.
67+
push-daemon:
6868

6969
# Ensure test job passes before pushing image.
7070
needs: test-daemon
7171

72-
name: Build Daemon & Push to GitHub Registry
72+
name: Build & Push Daemon
7373
runs-on: ubuntu-latest
7474
permissions:
7575
contents: read
7676
packages: write
7777

7878
steps:
7979
- name: Checkout
80-
uses: actions/checkout@v3
80+
uses: actions/checkout@v4
8181

8282
- name: Set up QEMU
83-
uses: docker/setup-qemu-action@v2
83+
uses: docker/setup-qemu-action@v3
8484

8585
- name: Set up Docker Buildx
86-
uses: docker/setup-buildx-action@v2
86+
uses: docker/setup-buildx-action@v3
8787

88-
# Login against a Docker registry except on PR
89-
# https://github.com/docker/login-action
90-
- name: Log into registry ${{ env.GITHUB_REGISTRY }}
88+
# Login to Docker Hub except on PR
89+
- name: Login to Docker Hub
9190
if: github.event_name != 'pull_request'
92-
uses: docker/login-action@v2
91+
uses: docker/login-action@v3
9392
with:
94-
registry: ${{ env.GITHUB_REGISTRY }}
95-
username: ${{ github.actor }}
96-
password: ${{ secrets.GITHUB_TOKEN }}
97-
98-
# Extract metadata (tags, labels) for Docker
99-
# https://github.com/docker/metadata-action
100-
- name: Extract Docker metadata
101-
id: meta
102-
uses: docker/metadata-action@v4
103-
with:
104-
images: ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME_DAEMON }}
105-
tags: |
106-
type=ref,event=branch
107-
type=semver,pattern={{version}}
108-
type=semver,pattern={{major}}
109-
type=semver,pattern={{major}}.{{minor}}
110-
type=semver,pattern={{major}}.{{minor}}.{{patch}}
111-
112-
# Build and push Docker image with Buildx (don't push on PR)
113-
# https://github.com/docker/build-push-action
114-
- name: Build and push Docker image
115-
uses: docker/build-push-action@v4
116-
with:
117-
context: ./daemon/
118-
platforms: linux/amd64,linux/arm64,linux/arm/v7
119-
push: ${{ github.event_name != 'pull_request' }}
120-
tags: ${{ steps.meta.outputs.tags }}
121-
labels: ${{ steps.meta.outputs.labels }}
122-
123-
# Push client image to GitHub Packages.
124-
push-client-to-github-packages:
125-
126-
# Ensure test job passes before pushing image.
127-
needs: test-client
128-
129-
name: Build Client & Push to GitHub Registry
130-
runs-on: ubuntu-latest
131-
permissions:
132-
contents: read
133-
packages: write
134-
135-
steps:
136-
- name: Checkout
137-
uses: actions/checkout@v3
138-
139-
- name: Set up QEMU
140-
uses: docker/setup-qemu-action@v2
141-
142-
- name: Set up Docker Buildx
143-
uses: docker/setup-buildx-action@v2
93+
registry: ${{ env.DOCKER_REGISTRY }}
94+
username: ${{ secrets.DOCKERHUB_USERNAME }}
95+
password: ${{ secrets.DOCKERHUB_TOKEN }}
14496

145-
# Login against a Docker registry except on PR
146-
# https://github.com/docker/login-action
147-
- name: Log into registry ${{ env.GITHUB_REGISTRY }}
97+
# Login to GitHub Container Registry except on PR
98+
- name: Login to GitHub Container Registry
14899
if: github.event_name != 'pull_request'
149-
uses: docker/login-action@v2
100+
uses: docker/login-action@v3
150101
with:
151102
registry: ${{ env.GITHUB_REGISTRY }}
152-
username: ${{ github.actor }}
103+
username: ${{ github.repository_owner }}
153104
password: ${{ secrets.GITHUB_TOKEN }}
154105

155106
# Extract metadata (tags, labels) for Docker
156-
# https://github.com/docker/metadata-action
157107
- name: Extract Docker metadata
158108
id: meta
159-
uses: docker/metadata-action@v4
109+
uses: docker/metadata-action@v5
160110
with:
161-
images: ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME_CLIENT }}
111+
images: |
112+
${{ env.IMAGE_NAME_DAEMON }}
113+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME_DAEMON }}
162114
tags: |
163115
type=ref,event=branch
164116
type=semver,pattern={{version}}
@@ -167,112 +119,63 @@ jobs:
167119
type=semver,pattern={{major}}.{{minor}}.{{patch}}
168120
169121
# Build and push Docker image with Buildx (don't push on PR)
170-
# https://github.com/docker/build-push-action
171122
- name: Build and push Docker image
172-
uses: docker/build-push-action@v4
123+
uses: docker/build-push-action@v5
173124
with:
174-
context: .
125+
context: ./daemon/
175126
platforms: linux/amd64,linux/arm64,linux/arm/v7
176127
push: ${{ github.event_name != 'pull_request' }}
177128
tags: ${{ steps.meta.outputs.tags }}
178129
labels: ${{ steps.meta.outputs.labels }}
179130

180-
# Push daemon image to Docker Hub.
181-
push-daemon-to-docker-hub:
131+
# Push client image to registry.
132+
push-client:
182133

183134
# Ensure test job passes before pushing image.
184-
needs: test-daemon
135+
needs: test-client
185136

186-
name: Build Daemon & Push to Docker Hub
137+
name: Build & Push Client
187138
runs-on: ubuntu-latest
188139
permissions:
189140
contents: read
190141
packages: write
191142

192143
steps:
193144
- name: Checkout
194-
uses: actions/checkout@v3
145+
uses: actions/checkout@v4
195146

196147
- name: Set up QEMU
197-
uses: docker/setup-qemu-action@v2
148+
uses: docker/setup-qemu-action@v3
198149

199150
- name: Set up Docker Buildx
200-
uses: docker/setup-buildx-action@v2
151+
uses: docker/setup-buildx-action@v3
201152

202-
# Login against a Docker registry except on PR
203-
# https://github.com/docker/login-action
204-
- name: Log into registry ${{ env.DOCKER_REGISTRY }}
153+
# Login to Docker Hub except on PR
154+
- name: Login to Docker Hub
205155
if: github.event_name != 'pull_request'
206-
uses: docker/login-action@v2
156+
uses: docker/login-action@v3
207157
with:
208158
registry: ${{ env.DOCKER_REGISTRY }}
209159
username: ${{ secrets.DOCKERHUB_USERNAME }}
210160
password: ${{ secrets.DOCKERHUB_TOKEN }}
211161

212-
# Extract metadata (tags, labels) for Docker
213-
# https://github.com/docker/metadata-action
214-
- name: Extract Docker metadata
215-
id: meta
216-
uses: docker/metadata-action@v4
217-
with:
218-
images: ${{ env.IMAGE_NAME_DAEMON }}
219-
tags: |
220-
type=ref,event=branch
221-
type=semver,pattern={{version}}
222-
type=semver,pattern={{major}}
223-
type=semver,pattern={{major}}.{{minor}}
224-
type=semver,pattern={{major}}.{{minor}}.{{patch}}
225-
226-
# Build and push Docker image with Buildx (don't push on PR)
227-
# https://github.com/docker/build-push-action
228-
- name: Build and push Docker image
229-
uses: docker/build-push-action@v4
230-
with:
231-
context: ./daemon/
232-
platforms: linux/amd64,linux/arm64,linux/arm/v7
233-
push: ${{ github.event_name != 'pull_request' }}
234-
tags: ${{ steps.meta.outputs.tags }}
235-
labels: ${{ steps.meta.outputs.labels }}
236-
237-
# Push client image to Docker Hub.
238-
push-client-to-docker-hub:
239-
240-
# Ensure test job passes before pushing image.
241-
needs: test-client
242-
243-
name: Build Client & Push to Docker Hub
244-
runs-on: ubuntu-latest
245-
permissions:
246-
contents: read
247-
packages: write
248-
249-
steps:
250-
- name: Checkout
251-
uses: actions/checkout@v3
252-
253-
- name: Set up QEMU
254-
uses: docker/setup-qemu-action@v2
255-
256-
- name: Set up Docker Buildx
257-
uses: docker/setup-buildx-action@v2
258-
259-
# Login against a Docker registry except on PR
260-
# https://github.com/docker/login-action
261-
- name: Log into registry ${{ env.DOCKER_REGISTRY }}
162+
# Login to GitHub Container Registry except on PR
163+
- name: Login to GitHub Container Registry
262164
if: github.event_name != 'pull_request'
263-
uses: docker/login-action@v2
165+
uses: docker/login-action@v3
264166
with:
265-
registry: ${{ env.DOCKER_REGISTRY }}
266-
username: ${{ secrets.DOCKERHUB_USERNAME }}
267-
password: ${{ secrets.DOCKERHUB_TOKEN }}
167+
registry: ${{ env.GITHUB_REGISTRY }}
168+
username: ${{ github.repository_owner }}
169+
password: ${{ secrets.GITHUB_TOKEN }}
268170

269171
# Extract metadata (tags, labels) for Docker
270-
# https://github.com/docker/metadata-action
271172
- name: Extract Docker metadata
272173
id: meta
273-
uses: docker/metadata-action@v4
174+
uses: docker/metadata-action@v5
274175
with:
275-
images: ${{ env.IMAGE_NAME_CLIENT }}
176+
images: |
177+
${{ env.IMAGE_NAME_CLIENT }}
178+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME_CLIENT }}
276179
tags: |
277180
type=ref,event=branch
278181
type=semver,pattern={{version}}
@@ -281,9 +184,8 @@ jobs:
281184
type=semver,pattern={{major}}.{{minor}}.{{patch}}
282185
283186
# Build and push Docker image with Buildx (don't push on PR)
284-
# https://github.com/docker/build-push-action
285187
- name: Build and push Docker image
286-
uses: docker/build-push-action@v4
188+
uses: docker/build-push-action@v5
287189
with:
288190
context: .
289191
platforms: linux/amd64,linux/arm64,linux/arm/v7

‎daemon/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:lts-alpine
1+
FROM node:lts-alpine3.16
22

33
# Create app directory
44
WORKDIR /usr/src/app

0 commit comments

Comments
 (0)