Skip to content

Commit 3a3119b

Browse files
tuxpeopletuxpeople
authored
Merge pull request #200 from tuxpeople/fix/ci
fix(ci): add BUILDKIT_PROGRESS=plain
2 parents 41bd4ed + 0bc7993 commit 3a3119b

File tree

2 files changed

+46
-60
lines changed

2 files changed

+46
-60
lines changed

‎.github/workflows/pullrequests.yml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "Build & Test"
22

33
env:
4-
PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64" # Build for which platforms
4+
PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64" # Build for which platforms
55

66
on:
77
pull_request:
@@ -11,32 +11,28 @@ jobs:
1111
docker:
1212
runs-on: ubuntu-latest
1313
steps:
14-
-
15-
name: Checkout
14+
- name: Checkout
1615
uses: actions/[email protected]
17-
-
18-
name: Generate Build-Args
16+
- name: Generate Build-Args
1917
id: build-args
2018
run: |
2119
# echo ::set-output name=build-arg1::"buildarg1"
2220
# echo ::set-output name=build-arg2::"buildarg2"
23-
-
24-
name: Hadolint
21+
- name: Hadolint
2522
uses: brpaz/[email protected]
26-
with:
23+
with:
2724
dockerfile: Dockerfile
28-
-
29-
name: Set up QEMU
25+
- name: Set up QEMU
3026
uses: docker/[email protected]
31-
-
32-
name: Set up Docker Buildx
27+
- name: Set up Docker Buildx
3328
uses: docker/[email protected]
34-
-
35-
name: Build and push
29+
- name: Build and push
3630
id: docker_build
3731
uses: docker/[email protected]
32+
env:
33+
BUILDKIT_PROGRESS: plain
3834
with:
3935
context: .
4036
file: ./Dockerfile
4137
platforms: ${{ env.PLATFORMS }}
42-
push: false
38+
push: false

‎.github/workflows/release.yml‎

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88
release:
99
types: [published]
1010
schedule:
11-
- cron: '3 3 * * *'
11+
- cron: "3 3 * * *"
1212
push:
1313
branches:
14-
- 'master'
15-
- 'main'
14+
- "master"
15+
- "main"
1616

1717
env:
18-
PLATFORMS: "linux/amd64,linux/arm64" # Build for which platforms
19-
DOCKER_USER: "tdeutsch" # Which user to use to login to DockerHub
18+
PLATFORMS: "linux/amd64,linux/arm64" # Build for which platforms
19+
DOCKER_USER: "tdeutsch" # Which user to use to login to DockerHub
2020

2121
#####
2222
# To rebuild someone else's repo, do this:
@@ -32,25 +32,21 @@ jobs:
3232
docker:
3333
runs-on: ubuntu-latest
3434
steps:
35-
-
36-
name: Checkout
35+
- name: Checkout
3736
uses: actions/[email protected]
38-
-
39-
name: Generate Build-Args
37+
- name: Generate Build-Args
4038
id: build-args
4139
run: |
4240
# echo ::set-output name=build-arg1::"buildarg1"
4341
# echo ::set-output name=build-arg2::"buildarg2"
44-
-
45-
name: Bump version and push tag if needed
42+
- name: Bump version and push tag if needed
4643
id: tag_version
4744
if: github.event_name == 'push'
4845
uses: mathieudutour/[email protected]
4946
with:
5047
github_token: ${{ secrets.GITHUB_TOKEN }}
5148
default_bump: false
52-
-
53-
name: Create a GitHub release if new version
49+
- name: Create a GitHub release if new version
5450
uses: actions/create-release@v1
5551
if: ${{ steps.tag_version.outputs.new_tag }}
5652
env:
@@ -59,8 +55,7 @@ jobs:
5955
tag_name: ${{ steps.tag_version.outputs.new_tag }}
6056
release_name: Release ${{ steps.tag_version.outputs.new_tag }}
6157
body: ${{ steps.tag_version.outputs.changelog }}
62-
-
63-
name: Prepare
58+
- name: Prepare
6459
id: prep
6560
run: |
6661
IMAGENAME=$(echo ${{ github.repository }} | sed 's/${{ github.repository_owner }}\/docker-//g')
@@ -95,36 +90,32 @@ jobs:
9590
echo ::set-output name=imagename::${IMAGENAME}
9691
echo ::set-output name=version::${VERSION}
9792
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
98-
-
99-
name: Hadolint
93+
- name: Hadolint
10094
uses: brpaz/[email protected]
101-
with:
95+
with:
10296
dockerfile: Dockerfile
103-
-
104-
name: Set up QEMU
97+
- name: Set up QEMU
10598
uses: docker/[email protected]
106-
-
107-
name: Set up Docker Buildx
99+
- name: Set up Docker Buildx
108100
uses: docker/[email protected]
109-
-
110-
name: Login to GHCR
101+
- name: Login to GHCR
111102
uses: docker/login-action@v3
112103
if: github.event_name != 'pull_request'
113104
with:
114105
registry: ghcr.io
115106
username: ${{ github.repository_owner }}
116107
password: ${{ secrets.GITHUB_TOKEN }}
117-
-
118-
name: Login to Dockerhub
108+
- name: Login to Dockerhub
119109
uses: docker/login-action@v3
120110
if: github.event_name != 'pull_request'
121111
with:
122112
username: ${{ env.DOCKER_USER }}
123113
password: ${{ secrets.DOCKERPASSWORD }}
124-
-
125-
name: Build and push
114+
- name: Build and push
126115
id: docker_build
127116
uses: docker/[email protected]
117+
env:
118+
BUILDKIT_PROGRESS: plain
128119
with:
129120
context: .
130121
file: ./Dockerfile
@@ -143,23 +134,22 @@ jobs:
143134
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
144135
org.opencontainers.image.revision=${{ github.sha }}
145136
org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }}
146-
-
147-
# name: Install latest Skopeo # GitHub's ubuntu 22 uses Skopeo 1.4 but we need newer to fix the "unsupported MIME type for compression: application/vnd.in-toto+json" error
148-
# run: |
149-
# echo 'deb http://download.opensuse.org/repositories/home:/alvistack/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/home:alvistack.list
150-
# curl -fsSL https://download.opensuse.org/repositories/home:alvistack/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_alvistack.gpg > /dev/null
151-
# sudo apt update
152-
# sudo apt -o Dpkg::Options::="--force-overwrite" install skopeo
153-
# -
154-
# name: Copy to Docker Hub
155-
# id: copy_images
156-
# run: |
157-
# for i in $(echo ${{ steps.prep.outputs.tags }} | sed "s/,/ /g")
158-
# do
159-
# GHTAG=$(echo $i | sed "s/ghcr.io/docker.io/g" | sed "s/${{ github.repository_owner }}/${{ env.DOCKER_USER }}/g")
160-
# skopeo copy --all --src-creds=${{ github.repository_owner }}:${{ secrets.GITHUB_TOKEN }} --dest-creds=${{ env.DOCKER_USER }}:${{ secrets.DOCKERPASSWORD }} docker://${i} docker://${GHTAG}
161-
# done
162-
# -
137+
- # name: Install latest Skopeo # GitHub's ubuntu 22 uses Skopeo 1.4 but we need newer to fix the "unsupported MIME type for compression: application/vnd.in-toto+json" error
138+
# run: |
139+
# echo 'deb http://download.opensuse.org/repositories/home:/alvistack/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/home:alvistack.list
140+
# curl -fsSL https://download.opensuse.org/repositories/home:alvistack/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_alvistack.gpg > /dev/null
141+
# sudo apt update
142+
# sudo apt -o Dpkg::Options::="--force-overwrite" install skopeo
143+
# -
144+
# name: Copy to Docker Hub
145+
# id: copy_images
146+
# run: |
147+
# for i in $(echo ${{ steps.prep.outputs.tags }} | sed "s/,/ /g")
148+
# do
149+
# GHTAG=$(echo $i | sed "s/ghcr.io/docker.io/g" | sed "s/${{ github.repository_owner }}/${{ env.DOCKER_USER }}/g")
150+
# skopeo copy --all --src-creds=${{ github.repository_owner }}:${{ secrets.GITHUB_TOKEN }} --dest-creds=${{ env.DOCKER_USER }}:${{ secrets.DOCKERPASSWORD }} docker://${i} docker://${GHTAG}
151+
# done
152+
# -
163153
name: Docker Hub Description
164154
uses: peter-evans/[email protected]
165155
with:

0 commit comments

Comments
 (0)