Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: github-actions update #1825

Merged
merged 8 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ jobs:
username: ${{ env.BOT_USERNAME }}
password: '${{ secrets.BOT_TOKEN }}'
- name: CI tests, image build and push tag for main or branch
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
context: .
tags: |
${{ env.CACHE_REGISTRY }}/${{ env.CACHE_REPO }}:${{ env.TAG }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/otomi-tools-build-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ jobs:
password: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }}
- name: image build and push tag for branch
if: ${{ env.NEW_VERSION != null }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
context: './tools'
platforms: linux/amd64
file: tools/Dockerfile
tags: |
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM linode/apl-tools:v2.8.2 as ci
FROM linode/apl-tools:v2.8.2 AS ci

ENV APP_HOME=/home/app/stack

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

# --------------- Cleanup
FROM ci as clean
FROM ci AS clean

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

FROM linode/apl-tools:v2.8.2 as prod
FROM linode/apl-tools:v2.8.2 AS prod
ENV APP_HOME=/home/app/stack
ENV ENV_DIR=/home/app/stack/env
ENV VERBOSITY='0'
Expand Down
4 changes: 2 additions & 2 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.6
FROM ubuntu:20.04 as builder
FROM ubuntu:20.04 AS builder

ARG DEBIAN_FRONTEND=noninteractive
ARG TARGETARCH
Expand Down Expand Up @@ -127,7 +127,7 @@ RUN set -uex && \
apt-get install -y nodejs && \
npm install -g [email protected] [email protected] zx

FROM ubuntu:20.04 as final
FROM ubuntu:20.04 AS final

RUN mkdir -p /home/app
RUN groupadd -r app &&\
Expand Down