From 6df82b539feeaaf75a383db87d3ecb4089a089e7 Mon Sep 17 00:00:00 2001 From: core Date: Sun, 7 Apr 2024 15:24:41 -0400 Subject: [PATCH] ci work 8 --- .woodpecker/.backplane.yaml | 18 +++++++----------- .woodpecker/.client.yaml | 18 +++++++----------- .woodpecker/.server.yaml | 18 +++++++----------- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.woodpecker/.backplane.yaml b/.woodpecker/.backplane.yaml index 20296445377eb6c98e2a5a83eb47c20e5e76cf6f..dcd55fd68e1405ef8bccc66a075e4d3a86228ae9 100644 --- a/.woodpecker/.backplane.yaml +++ b/.woodpecker/.backplane.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 diff --git a/.woodpecker/.client.yaml b/.woodpecker/.client.yaml index 84d4f7150ce5f9e150b0acbe47c1df5b44f4e5ba..b83b0b76b1bfc0388ae0b05550eeea390d060284 100644 --- a/.woodpecker/.client.yaml +++ b/.woodpecker/.client.yaml @@ -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 diff --git a/.woodpecker/.server.yaml b/.woodpecker/.server.yaml index 19cade9c6e1b008f250fef417f9998704a04ec11..070efd51b62ae6750988188b283b6c662f3472a2 100644 --- a/.woodpecker/.server.yaml +++ b/.woodpecker/.server.yaml @@ -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