From e62641a6610c874ef43b235aa5dce32db6372da3 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sat, 29 Jul 2023 11:59:29 -0700
Subject: [PATCH] Just use the plain docker container

---
 .woodpecker.yaml | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 6316daa..18a55a5 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -23,17 +23,14 @@ steps:
     when:
       event: tag
   nightly-image:
-    image: woodpeckerci/plugin-docker-buildx
-    privileged: true
-    settings:
-      dockerfile: Dockerfile.nightly
-      registry: git.snyman.info
-      username: $DOCKER_USERNAME
-      password: $DOCKER_TOKEN
-      repo: git.snyman.info/${CI_REPO_OWNER}/codesmidgen
-      tags:
-        - nightly
-        - ${CI_COMMIT_SHA:0:8}
+    image: docker
+    commands:
+      - "docker login git.snyman.info $DOCKER_USERNAME $DOCKER_TOKEN"
+      - "docker build -t git.snyman.info/codesmidgen:nightly -t git.snyman.info/codesmidgen:${CI_COMMIT_SHA:0:8} ."
+      - "docker push git.snyman.info/codesmidgen:nightly"
+      - "docker push git.snyman.info/codesmidgen:${CI_COMMIT_SHA:0:8}"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     secrets:
       - docker_username
       - docker_token
@@ -41,17 +38,14 @@ steps:
       - branch: master
         event: push
   release-image:
-    image: woodpeckerci/plugin-docker-buildx
-    privileged: true
-    settings:
-      dockerfile: Dockerfile.release
-      registry: git.snyman.info
-      username: $DOCKER_USERNAME
-      password: $DOCKER_TOKEN
-      repo: git.snyman.info/${CI_REPO_OWNER}/codesmidgen
-      tags:
-        - latest
-        - ${CI_COMMIT_TAG##v}
+    image: docker
+    commands:
+      - "docker login git.snyman.info $DOCKER_USERNAME $DOCKER_TOKEN"
+      - "docker build -t git.snyman.info/codesmidgen:latest -t git.snyman.info/codesmidgen:${CI_COMMIT_TAG##v} ."
+      - "docker push git.snyman.info/codesmidgen:latest"
+      - "docker push git.snyman.info/codesmidgen:${CI_COMMIT_TAG##v}"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     secrets:
       - docker_username
       - docker_token
-- 
2.45.2