Skip to content

Commit

Permalink
minor fixes for the ci workflow (#33)
Browse files Browse the repository at this point in the history
  • Loading branch information
yajith authored Sep 19, 2024
1 parent b41942a commit e8f191c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 21 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/dev.workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@ jobs:
environment:
name: staging
steps:
- name: checkout code
uses: actions/checkout@v2
# https://github.com/docker/setup-qemu-action
- name: "[preparation] checkout"
uses: actions/checkout@v4.1.1

- name: "[preparation] set up golang"
uses: actions/setup-go@v5.0.0
with:
go-version-file: go.mod
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
# https://github.com/docker/setup-buildx-action

- name: "[preparation] set up qemu"
uses: docker/setup-qemu-action@v3.2.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3.6.1
with:
driver-opts: image=moby/buildkit:v0.10.6
- uses: actions/setup-go@v3
with:
go-version: "1.22.5"

- name: login to docker hub
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin

- name: build the image to portainer ci with PR number
- name: "build the image to portainer ci with PR number (portainerci/portainer-updater:pr${{ github.event.pull_request.number }})"
if: ${{ github.event.pull_request.number != '' }}
run: |
"${GITHUB_WORKSPACE}/build/build_and_push.sh" portainerci pr$GITHUB_PR_NUMBER
- name: build the image to portainer ci ( Develop Latest )
- name: "build the image to portainer ci (portainerci/portainer-updater:develop)"
if: ${{ github.ref == 'refs/heads/develop' }}
run: |
"${GITHUB_WORKSPACE}/build/build_and_push.sh" portainerci develop
8 changes: 1 addition & 7 deletions build/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
ARG GIT_COMMIT=unspecified

FROM alpine:3.6 as base
RUN apk add -U --no-cache ca-certificates


FROM scratch
FROM portainer/base:latest

LABEL git_commit=$GIT_COMMIT

COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY dist /

ENTRYPOINT [ "/portainer-updater" ]
4 changes: 2 additions & 2 deletions build/windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG GIT_COMMIT=unspecified
ARG OSVERSION
FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core
FROM --platform=linux/amd64 alpine:3.13.0 as downloader
FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} AS core
FROM --platform=linux/amd64 alpine:3.13.0 AS downloader
ENV GIT_VERSION 2.46.0
ENV GIT_PATCH_VERSION 1

Expand Down

0 comments on commit e8f191c

Please sign in to comment.