Merge pull request #1282 from crazy-max/remove-buildkit-5561

Revert "init buildkit-5561 workflow"
2024-12-27 19:34:34 +08:00 · 2024-12-17 16:32:34 +01:00 · 2024-12-17 16:26:04 +01:00 · 2024-12-17 16:18:44 +01:00 · 2024-12-17 16:12:32 +01:00 · 2024-12-05 15:27:22 +01:00
2 changed files with 15 additions and 14 deletions
--- a/README.md
+++ b/README.md
@ -60,18 +60,18 @@ jobs:
  docker:
    runs-on: ubuntu-latest
    steps:
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      -
        name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Build and push
        uses: docker/build-push-action@v6
@ -132,18 +132,18 @@ jobs:
      -
        name: Checkout
        uses: actions/checkout@v4
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      -
        name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Build and push
        uses: docker/build-push-action@v6
--- a/test/multi-sudo.Dockerfile
+++ b/test/multi-sudo.Dockerfile
@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM --platform=$BUILDPLATFORM golang:alpine AS build
+
+FROM --platform=$BUILDPLATFORM alpine AS build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
@ -12,7 +13,7 @@ RUN apk --update --no-cache add \
  && rm -rf /tmp/* /var/cache/apk/*

 USER buildx
-RUN sudo chown buildx. /log
+RUN sudo chown buildx: /log
 USER root

 FROM alpine
Author	SHA1	Message	Date
CrazyMax	7e094594be	Merge pull request #1282 from crazy-max/remove-buildkit-5561 Revert "init buildkit-5561 workflow"	2024-12-17 16:32:34 +01:00
CrazyMax	32ee877a58	Revert "init buildkit-5561 workflow" This reverts commit f5a8591a7ff7468794d6a699b95c45220ef644f9. Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-12-17 16:26:04 +01:00
CrazyMax	bcc9f4afe7	Merge pull request #1284 from crazy-max/dockerfiles-pin-bases test: fix multi-sudo dockerfile	2024-12-17 16:18:44 +01:00
CrazyMax	da5b6c75b9	test: fix multi-sudo dockerfile Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-12-17 16:12:32 +01:00
CrazyMax	11be14d908	Merge pull request #1274 from crazy-max/init-buildkit-5561 init buildkit-5561 workflow	2024-12-05 15:27:22 +01:00
CrazyMax	f5a8591a7f	init buildkit-5561 workflow Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-12-05 15:21:59 +01:00
CrazyMax	8796455d32	Merge pull request #1272 from crazy-max/update-readme readme: move login step up	2024-12-03 16:04:51 +01:00
CrazyMax	750f367828	readme: move login step up Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-12-03 15:36:12 +01:00