3 files changed, 21 insertions(+), 33 deletions(-)

M .woodpecker/.backplane.yaml
M .woodpecker/.client.yaml
M .woodpecker/.server.yaml

@@ 50,16 50,12 @@ steps:
   - name: build_image
     depends_on:
       - backplane_build
-    image: woodpeckerci/plugin-docker-buildx
+    image: docker
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    settings:
-      repo: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/backplane
-      dockerfile: starkingdoms-backplane/Dockerfile
-      username: c0repwn3r
-      password:
-        from_secret: gitlab_token
-      tag: ${CI_COMMIT_TAG}
-      registry: https://registry.gitlab.com
-    when:
-      event: tag>
\ No newline at end of file
+    privileged: true
+    commands:
+      - docker login registry.gitlab.com -u c0repwn3r -p $GITLAB_TOKEN
+      - docker buildx build . -f starkingdoms-backplane/Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/backplane:$(git describe --always)
+      - docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/backplane:$(git describe --always)
+    secrets: [ gitlab_token ]<
\ No newline at end of file

@@ 18,16 18,12 @@ steps:
   - name: build_image
     depends_on:
       - client_build
-    image: woodpeckerci/plugin-docker-buildx
+    image: docker
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    settings:
-      repo: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/client
-      dockerfile: starkingdoms-client/Dockerfile
-      username: c0repwn3r
-      password:
-        from_secret: gitlab_token
-      tag: ${CI_COMMIT_TAG}
-      registry: https://registry.gitlab.com
-    when:
-      event: tag>
\ No newline at end of file
+    privileged: true
+    commands:
+      - docker login registry.gitlab.com -u c0repwn3r -p $GITLAB_TOKEN
+      - docker buildx build . -f starkingdoms-client/Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/client:$(git describe --always)
+      - docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/client:$(git describe --always)
+    secrets: [ gitlab_token ]<
\ No newline at end of file

@@ 53,16 53,12 @@ steps:
   - name: build_image
     depends_on:
       - server_build
-    image: woodpeckerci/plugin-docker-buildx
+    image: docker
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    settings:
-      repo: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/server
-      dockerfile: server/Dockerfile
-      username: c0repwn3r
-      password:
-        from_secret: gitlab_token
-      tag: ${CI_COMMIT_TAG}
-      registry: https://registry.gitlab.com
-    when:
-      event: tag>
\ No newline at end of file
+    privileged: true
+    commands:
+      - docker login registry.gitlab.com -u c0repwn3r -p $GITLAB_TOKEN
+      - docker buildx build . -f server/Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/server:$(git describe --always)
+      - docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/server:$(git describe --always)
+    secrets: [ gitlab_token ]<
\ No newline at end of file