Skip to content

Commit e0bc42e

Browse files
feat: github-actions update (#1825)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 662db99 commit e0bc42e

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.github/workflows/main.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ jobs:
4040
username: ${{ env.BOT_USERNAME }}
4141
password: '${{ secrets.BOT_TOKEN }}'
4242
- name: CI tests, image build and push tag for main or branch
43-
uses: docker/build-push-action@v5
43+
uses: docker/build-push-action@v6
4444
with:
4545
push: true
46+
context: .
4647
tags: |
4748
${{ env.CACHE_REGISTRY }}/${{ env.CACHE_REPO }}:${{ env.TAG }}
4849

.github/workflows/otomi-tools-build-push.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ jobs:
8080
password: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }}
8181
- name: image build and push tag for branch
8282
if: ${{ env.NEW_VERSION != null }}
83-
uses: docker/build-push-action@v5
83+
uses: docker/build-push-action@v6
8484
with:
8585
push: true
86+
context: './tools'
8687
platforms: linux/amd64
8788
file: tools/Dockerfile
8889
tags: |

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM linode/apl-tools:v2.8.2 as ci
1+
FROM linode/apl-tools:v2.8.2 AS ci
22

33
ENV APP_HOME=/home/app/stack
44

@@ -21,12 +21,12 @@ RUN npm ci --ignore-scripts && npm run compile
2121
RUN if [ "$SKIP_TESTS" = 'false' ]; then ln -s $APP_HOME/tests/fixtures env && npm test && rm env; fi
2222

2323
# --------------- Cleanup
24-
FROM ci as clean
24+
FROM ci AS clean
2525

2626
# below command removes the packages specified in devDependencies and set NODE_ENV to production
2727
RUN npm prune --production
2828

29-
FROM linode/apl-tools:v2.8.2 as prod
29+
FROM linode/apl-tools:v2.8.2 AS prod
3030
ENV APP_HOME=/home/app/stack
3131
ENV ENV_DIR=/home/app/stack/env
3232
ENV VERBOSITY='0'

tools/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.6
2-
FROM ubuntu:20.04 as builder
2+
FROM ubuntu:20.04 AS builder
33

44
ARG DEBIAN_FRONTEND=noninteractive
55
ARG TARGETARCH
@@ -127,7 +127,7 @@ RUN set -uex && \
127127
apt-get install -y nodejs && \
128128
129129

130-
FROM ubuntu:20.04 as final
130+
FROM ubuntu:20.04 AS final
131131

132132
RUN mkdir -p /home/app
133133
RUN groupadd -r app &&\

0 commit comments

Comments
 (0)