Skip to content

Commit 5fe05cb

Browse files
authored
Merge pull request #71 from devilbox/update-deprecations
Fix deprecations
2 parents 5a3dad1 + 96f97f6 commit 5fe05cb

File tree

2 files changed

+30
-15
lines changed

2 files changed

+30
-15
lines changed

.github/workflows/docker-name-version-arch.yml

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
shell: bash
5454
run: |
5555
if [ "${{ env.ENV_USER }}" = '' ] || [ "${{ env.ENV_PASS }}" = '' ]; then
56-
echo "::set-output name=can_login::0"
56+
echo "can_login=0" >> $GITHUB_OUTPUT
5757
else
58-
echo "::set-output name=can_login::1"
58+
echo "can_login=1" >> $GITHUB_OUTPUT
5959
fi
6060
env:
6161
ENV_USER: ${{ secrets.dockerhub_username }}
@@ -76,9 +76,9 @@ jobs:
7676
--argjson refs '${{ inputs.refs }}' \
7777
'map({name:.NAME, version:.VERSION[], refs:$refs[]})' <<<'${{ inputs.matrix }}' \
7878
)"
79-
echo "::set-output name=matrix_build::${MATRIX_BUILD}"
80-
echo "::set-output name=matrix_deploy::${MATRIX_DEPLOY}"
81-
echo "::set-output name=has_refs::1"
79+
echo "matrix_build=${MATRIX_BUILD}" >> $GITHUB_OUTPUT
80+
echo "matrix_deploy=${MATRIX_DEPLOY}" >> $GITHUB_OUTPUT
81+
echo "has_refs=1" >> $GITHUB_OUTPUT
8282
else
8383
MATRIX_BUILD="$( \
8484
jq -M -c \
@@ -88,9 +88,9 @@ jobs:
8888
jq -M -c \
8989
'map({name:.NAME, version:.VERSION[]})' <<<'${{ inputs.matrix }}' \
9090
)"
91-
echo "::set-output name=matrix_build::${MATRIX_BUILD}"
92-
echo "::set-output name=matrix_deploy::${MATRIX_DEPLOY}"
93-
echo "::set-output name=has_refs::0"
91+
echo "matrix_build=${MATRIX_BUILD}" >> $GITHUB_OUTPUT
92+
echo "matrix_deploy=${MATRIX_DEPLOY}" >> $GITHUB_OUTPUT
93+
echo "has_refs=0" >> $GITHUB_OUTPUT
9494
fi
9595
9696
- name: "[DEBUG] Workflow Inputs"
@@ -148,14 +148,29 @@ jobs:
148148
id: tag
149149
uses: cytopia/[email protected]
150150

151+
# https://github.com/alpinelinux/docker-alpine/issues/98
152+
- name: "[SETUP] Fix Docker IP forwarding"
153+
run: |
154+
sysctl net.ipv4.ip_forward
155+
sudo sysctl -w net.ipv4.ip_forward=1
156+
sudo systemctl restart docker
157+
151158
# ------------------------------------------------------------
152159
# Build
153160
# ------------------------------------------------------------
161+
- name: Pull Base
162+
uses: cytopia/[email protected]
163+
with:
164+
command: |
165+
make docker-pull-base-image VERSION="${{ matrix.version }}" ARCH=${{ matrix.arch }}
166+
154167
- name: Build
155168
uses: cytopia/[email protected]
156169
with:
170+
retries: 10
171+
pause: 5
157172
command: |
158-
make build NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
173+
make build NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
159174
160175
# ------------------------------------------------------------
161176
# Test
@@ -164,7 +179,7 @@ jobs:
164179
uses: cytopia/[email protected]
165180
with:
166181
command: |
167-
make test NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
182+
make test NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
168183
169184
# ------------------------------------------------------------
170185
# Deploy
@@ -180,7 +195,7 @@ jobs:
180195
uses: cytopia/[email protected]
181196
with:
182197
command: |
183-
make push NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
198+
make push NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
184199
if: needs.configure.outputs.can_login == 1 && inputs.can_deploy
185200

186201
# -----------------------------------------------------------------------------------------------
@@ -225,7 +240,7 @@ jobs:
225240
| jq '.[] | select(.NAME=="${{ matrix.name }}" and .VERSION=="${{ matrix.version }}") | .ARCHES' \
226241
| jq -c -M \
227242
)"
228-
echo "::set-output name=arches::${ARCHES}"
243+
echo "arches=${ARCHES}" >> $GITHUB_OUTPUT
229244
echo "ARCHES: ${ARCHES}"
230245
231246
@@ -242,10 +257,10 @@ jobs:
242257
uses: cytopia/[email protected]
243258
with:
244259
command: |
245-
make manifest-create NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}
260+
make manifest-create NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}
246261
247262
- name: "[DEPLOY] Publish Docker manifest: ${{ steps.tag.outputs.docker-tag }}"
248263
uses: cytopia/[email protected]
249264
with:
250265
command: |
251-
make manifest-push NAME=${{ matrix.name }} VERSION=${{ matrix.version }} TAG=${{ steps.tag.outputs.docker-tag }}
266+
make manifest-push NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" TAG=${{ steps.tag.outputs.docker-tag }}

.github/workflows/docker-name-version-flavour-arch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
retries: 10
171171
pause: 5
172172
command: |
173-
make rebuild NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
173+
make build NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
174174
175175
# ------------------------------------------------------------
176176
# Test

0 commit comments

Comments
 (0)