From 7e9d9d70ed772bca407a1320d9bf03d2ba1c8fa7 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 14:16:54 +0200 Subject: [PATCH 01/31] add Dockerfiles for s3cmd --- s3cmd/Dockerfile | 3 +++ s3cmd/Linux.Dockerfile | 0 s3cmd/Windows.Dockerfile | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 s3cmd/Dockerfile create mode 100644 s3cmd/Linux.Dockerfile create mode 100644 s3cmd/Windows.Dockerfile diff --git a/s3cmd/Dockerfile b/s3cmd/Dockerfile new file mode 100644 index 0000000..d668a78 --- /dev/null +++ b/s3cmd/Dockerfile @@ -0,0 +1,3 @@ +FROM python:3 + +RUN python -m pip install --system s3cmd diff --git a/s3cmd/Linux.Dockerfile b/s3cmd/Linux.Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/s3cmd/Windows.Dockerfile b/s3cmd/Windows.Dockerfile new file mode 100644 index 0000000..215f356 --- /dev/null +++ b/s3cmd/Windows.Dockerfile @@ -0,0 +1,6 @@ +FROM winamd64/python:3 + +RUN python -m pip install --system s3cmd + +SHELL ["powershell", "-Command", "Set-StrictMode -Version Latest; $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +CMD ["powershell", "-NoExit", "-Command", "Set-StrictMode -Version Latest; $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] From 920f7fac8993e0b9abb3621a6f3fe64f71109051 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 15:56:35 +0200 Subject: [PATCH 02/31] Created on Dockerfile for Linux and Windows --- s3cmd/Dockerfile | 15 ++++++++++++++- s3cmd/Linux.Dockerfile | 0 s3cmd/Windows.Dockerfile | 6 ------ s3cmd/rename_script.py | 5 +++++ 4 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 s3cmd/Linux.Dockerfile delete mode 100644 s3cmd/Windows.Dockerfile create mode 100644 s3cmd/rename_script.py diff --git a/s3cmd/Dockerfile b/s3cmd/Dockerfile index d668a78..4984fa5 100644 --- a/s3cmd/Dockerfile +++ b/s3cmd/Dockerfile @@ -1,3 +1,16 @@ +#escape=` + +# This Dockerfile will be build on Windows and Linux +# It will rename the s3cmd script to s3cmd.py on Windows +# Afterwards "s3cmd" will be available as a global command FROM python:3 -RUN python -m pip install --system s3cmd +LABEL maintainer="OpenCloud.eu Team " ` + name="opencloudeu/s3cmd" ` + vendor="OpenCloud GmbH" ` + source="https://github.com/opencloud-eu/ci-docker-desktop" + +COPY rename_script.py rename_script.py + +RUN python -m pip install s3cmd ; ` + python rename_script.py diff --git a/s3cmd/Linux.Dockerfile b/s3cmd/Linux.Dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/s3cmd/Windows.Dockerfile b/s3cmd/Windows.Dockerfile deleted file mode 100644 index 215f356..0000000 --- a/s3cmd/Windows.Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM winamd64/python:3 - -RUN python -m pip install --system s3cmd - -SHELL ["powershell", "-Command", "Set-StrictMode -Version Latest; $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -CMD ["powershell", "-NoExit", "-Command", "Set-StrictMode -Version Latest; $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/s3cmd/rename_script.py b/s3cmd/rename_script.py new file mode 100644 index 0000000..0da66b3 --- /dev/null +++ b/s3cmd/rename_script.py @@ -0,0 +1,5 @@ +import os +if os.name == 'nt': + # rename file on windows to make sure it runs as python script + os.rename('/Python/Scripts/s3cmd', '/Python/Scripts/s3cmd.py') +exit(0) From ddcdae31250e9a5cfd5e4658889449093bae3ac4 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 16:28:54 +0200 Subject: [PATCH 03/31] pinned requirements versions and hashes and added renovate.json --- .github/renovate.json | 13 +++++++++++++ s3cmd/Dockerfile | 4 ++-- s3cmd/requirements.txt | 4 ++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .github/renovate.json create mode 100644 s3cmd/requirements.txt diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..3c8e5fd --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,13 @@ +{ + "extends": ["config:base"], + "regexManagers": [ + { + "fileMatch": ["^requirements\\.txt$"], + "matchStrings": [ + "^(?[a-zA-Z0-9\\-_]+)==(?[a-zA-Z0-9\\.]+) --hash=sha256:(?[a-fA-F0-9]{64})$" + ], + "datasourceTemplate": "pypi", + "depNameTemplate": "{{depName}}" + } + ] +} \ No newline at end of file diff --git a/s3cmd/Dockerfile b/s3cmd/Dockerfile index 4984fa5..11c2a44 100644 --- a/s3cmd/Dockerfile +++ b/s3cmd/Dockerfile @@ -10,7 +10,7 @@ LABEL maintainer="OpenCloud.eu Team " ` vendor="OpenCloud GmbH" ` source="https://github.com/opencloud-eu/ci-docker-desktop" -COPY rename_script.py rename_script.py +COPY . . -RUN python -m pip install s3cmd ; ` +RUN python -m pip install -r requirements.txt ; ` python rename_script.py diff --git a/s3cmd/requirements.txt b/s3cmd/requirements.txt new file mode 100644 index 0000000..d5e5fb4 --- /dev/null +++ b/s3cmd/requirements.txt @@ -0,0 +1,4 @@ +python-magic==0.4.27 --hash=sha256:c212960ad306f700aa0d01e5d7a325d20548ff97eb9920dcd29513174f0294d3 +six==1.17.0 --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 +python-dateutil==2.9.0.post0 --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427 +s3cmd==2.4.0 --hash=sha256:13ad8a44d44cc0535ba8c878c91fd68cd830dc48f6388722fa44a7aaf3f18017 \ No newline at end of file From 146e49f2fde2ccbb39ac900024818757ce8950b8 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 16:57:22 +0200 Subject: [PATCH 04/31] added woodpecker pipeline --- .woodpecker/build-s3cmd.yml | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .woodpecker/build-s3cmd.yml diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml new file mode 100644 index 0000000..6103e72 --- /dev/null +++ b/.woodpecker/build-s3cmd.yml @@ -0,0 +1,39 @@ +--- +# variables: + +when: + - event: push + branch: "add_s3cmd" + +matrix: + include: + - platform: linux/amd64 + clone_image: woodpeckerci/plugin-git + build_image: winamd64/docker:windowsservercore-ltsc2022 + - platform: windows/amd64 + clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 + build_image: docker + +labels: + platform: ${platform} + backend: docker + +clone: + - image: ${clone_image} + +steps: + - name: build windows + when: + - platform: windows/amd64 + image: ${build_image} + volumes: + - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' + commands: + - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd + + - name: build linux + when: + - platform: linux/* + image: ${build_image} + commands: + - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From f4be8fe52b975323652c998e1089c66ea3689b47 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:05:24 +0200 Subject: [PATCH 05/31] pipeline test --- .woodpecker/build-s3cmd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 6103e72..a389bcd 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -14,6 +14,7 @@ matrix: clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 build_image: docker + labels: platform: ${platform} backend: docker From 9d2a26410f90476a071f9d055aa7b9ff845a771e Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:06:48 +0200 Subject: [PATCH 06/31] pipeline test --- .woodpecker/build-s3cmd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index a389bcd..4ec639f 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -4,6 +4,7 @@ when: - event: push branch: "add_s3cmd" + - event: manual matrix: include: @@ -14,7 +15,6 @@ matrix: clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 build_image: docker - labels: platform: ${platform} backend: docker From 63bfee435abf0d4d4f981e574dad5c4c15a1ce3c Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:09:40 +0200 Subject: [PATCH 07/31] pipeline test --- .woodpecker/build-s3cmd.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 4ec639f..c9c05ec 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -20,7 +20,8 @@ labels: backend: docker clone: - - image: ${clone_image} + - name: clone + image: ${clone_image} steps: - name: build windows @@ -31,6 +32,7 @@ steps: - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd + - docker push opencloudeu/s3cmd - name: build linux when: @@ -38,3 +40,4 @@ steps: image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd + - docker push opencloudeu/s3cmd From 83eafb27fed17152fb0885ca07b965b1d0f6f36c Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:12:03 +0200 Subject: [PATCH 08/31] pipeline test --- .woodpecker/build-s3cmd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index c9c05ec..7683a44 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -26,7 +26,7 @@ clone: steps: - name: build windows when: - - platform: windows/amd64 + - platform: [windows/amd64] image: ${build_image} volumes: - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' @@ -36,7 +36,7 @@ steps: - name: build linux when: - - platform: linux/* + - platform: [linux/*] image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From b0c6e332e0af3a010c25e0c471fe9574a0314987 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:17:19 +0200 Subject: [PATCH 09/31] pipeline test --- .woodpecker/build-s3cmd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 7683a44..8b0aeef 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -26,7 +26,7 @@ clone: steps: - name: build windows when: - - platform: [windows/amd64] + - platform: "windows/amd64" image: ${build_image} volumes: - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' @@ -36,7 +36,7 @@ steps: - name: build linux when: - - platform: [linux/*] + - platform: "linux/*" image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From d1c8559909c8bcc828cd52bf34c522eb6815b889 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:19:32 +0200 Subject: [PATCH 10/31] pipeline test --- .woodpecker/build-s3cmd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 8b0aeef..f3db645 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -36,7 +36,8 @@ steps: - name: build linux when: - - platform: "linux/*" + - platform: + - "linux/amd64" image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From fc12867f7708955e1f12993e0c4621727718e59f Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:20:16 +0200 Subject: [PATCH 11/31] pipeline test --- .woodpecker/build-s3cmd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index f3db645..64b0f17 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -26,7 +26,7 @@ clone: steps: - name: build windows when: - - platform: "windows/amd64" + - platform: windows/amd64 image: ${build_image} volumes: - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' @@ -37,7 +37,7 @@ steps: - name: build linux when: - platform: - - "linux/amd64" + - linux/amd64 image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From 8d9d3454ccbe76fc8e5a5b57a051b1b8de9d6618 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:29:12 +0200 Subject: [PATCH 12/31] pipeline test --- .woodpecker/build-s3cmd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 64b0f17..5296b8a 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -10,10 +10,10 @@ matrix: include: - platform: linux/amd64 clone_image: woodpeckerci/plugin-git - build_image: winamd64/docker:windowsservercore-ltsc2022 + build_image: docker - platform: windows/amd64 clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 - build_image: docker + build_image: winamd64/docker:windowsservercore-ltsc2022 labels: platform: ${platform} From 87b3b2a4b91d8176ede8a9c03fdf40a4bfdb3a39 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:33:02 +0200 Subject: [PATCH 13/31] pipeline test --- .woodpecker/build-s3cmd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 5296b8a..bea6113 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -26,7 +26,7 @@ clone: steps: - name: build windows when: - - platform: windows/amd64 + platform: windows/amd64 image: ${build_image} volumes: - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' @@ -36,8 +36,8 @@ steps: - name: build linux when: - - platform: - - linux/amd64 + platform: + - linux/amd64 image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From 58d8c3f47b0072df0a84f9b1d5d66b1b50a56378 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:35:22 +0200 Subject: [PATCH 14/31] pipeline test --- .woodpecker/build-s3cmd.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index bea6113..a0cce28 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -26,7 +26,8 @@ clone: steps: - name: build windows when: - platform: windows/amd64 + - matrix: + platform: windows/amd64 image: ${build_image} volumes: - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' @@ -36,8 +37,8 @@ steps: - name: build linux when: - platform: - - linux/amd64 + - matrix: + platform: linux/amd64 image: ${build_image} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd From 830467638bf6bbf0df86a8f77933dafe509cf8db Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:41:09 +0200 Subject: [PATCH 15/31] pipeline test --- .woodpecker/build-s3cmd.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index a0cce28..5b5a414 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -11,9 +11,11 @@ matrix: - platform: linux/amd64 clone_image: woodpeckerci/plugin-git build_image: docker + socket_mount: /var/run/docker.sock:/var/run/docker.sock - platform: windows/amd64 clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 build_image: winamd64/docker:windowsservercore-ltsc2022 + socket_mount: \\\\.\\pipe\\docker_engine:\\\\.\\pipe\\docker_engine labels: platform: ${platform} @@ -24,22 +26,13 @@ clone: image: ${clone_image} steps: - - name: build windows + - name: build when: - matrix: platform: windows/amd64 image: ${build_image} volumes: - - '\\.\pipe\docker_engine:\\.\pipe\docker_engine' - commands: - - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - - docker push opencloudeu/s3cmd - - - name: build linux - when: - - matrix: - platform: linux/amd64 - image: ${build_image} + - ${socket_mount} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - docker push opencloudeu/s3cmd From cce64a0838704c66ed28f0ae9dc0f2a2ad600c79 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:41:48 +0200 Subject: [PATCH 16/31] pipeline test --- .woodpecker/build-s3cmd.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 5b5a414..1194b4a 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -15,7 +15,7 @@ matrix: - platform: windows/amd64 clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 build_image: winamd64/docker:windowsservercore-ltsc2022 - socket_mount: \\\\.\\pipe\\docker_engine:\\\\.\\pipe\\docker_engine + socket_mount: \\.\pipe\docker_engine:\\.\pipe\docker_engine labels: platform: ${platform} @@ -27,9 +27,6 @@ clone: steps: - name: build - when: - - matrix: - platform: windows/amd64 image: ${build_image} volumes: - ${socket_mount} From 41c627e82436f5457d20dcabea17687f985707d0 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Mon, 4 Aug 2025 17:44:56 +0200 Subject: [PATCH 17/31] pipeline test --- .woodpecker/build-s3cmd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 1194b4a..23af9f5 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -15,7 +15,7 @@ matrix: - platform: windows/amd64 clone_image: opencloudeu/woodpecker-windows-git-plugin:v2 build_image: winamd64/docker:windowsservercore-ltsc2022 - socket_mount: \\.\pipe\docker_engine:\\.\pipe\docker_engine + socket_mount: \\.\pipe\docker_engine\:\\.\pipe\docker_engine\ labels: platform: ${platform} @@ -32,4 +32,4 @@ steps: - ${socket_mount} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - - docker push opencloudeu/s3cmd + #- docker push opencloudeu/s3cmd From 8203a631e01e1e7cb08ca9994ce05d5e704c1206 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 09:57:51 +0200 Subject: [PATCH 18/31] pipeline test --- .woodpecker/build-s3cmd.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 23af9f5..fea9e18 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -1,5 +1,15 @@ --- -# variables: +variables: + DOCKER_URL: "docker.io" + DOCKER_USERNAME: + from_secret: docker_username + DOCKER_PASSWORD: + from_secret: docker_password + QUAY_URL: "quay.io" + QUAY_USERNAME: + from_secret: quay_username + QUAY_PASSWORD: + from_secret: quay_password when: - event: push @@ -32,4 +42,5 @@ steps: - ${socket_mount} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - #- docker push opencloudeu/s3cmd + - echo "${DOCKER_USERNAME}" | docker login --username ${DOCKER_USERNAME} --password-stdin ${DOCKER_URL} + - docker push opencloudeu/s3cmd From 45f7fd0b347366b9d497b5f53178934963488056 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 10:01:54 +0200 Subject: [PATCH 19/31] pipeline test --- .woodpecker/build-s3cmd.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index fea9e18..608b64c 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -1,15 +1,15 @@ --- variables: - DOCKER_URL: "docker.io" - DOCKER_USERNAME: - from_secret: docker_username - DOCKER_PASSWORD: - from_secret: docker_password - QUAY_URL: "quay.io" - QUAY_USERNAME: - from_secret: quay_username - QUAY_PASSWORD: - from_secret: quay_password + - DOCKER_URL: "docker.io" + - DOCKER_USERNAME: + from_secret: docker_username + - DOCKER_PASSWORD: + from_secret: docker_password + - QUAY_URL: "quay.io" + - QUAY_USERNAME: + from_secret: quay_username + - QUAY_PASSWORD: + from_secret: quay_password when: - event: push From a71d0a9a6f9c9a404361f95ce4cb4878acca469a Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 10:02:38 +0200 Subject: [PATCH 20/31] pipeline test --- .woodpecker/build-s3cmd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 608b64c..3869613 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -42,5 +42,5 @@ steps: - ${socket_mount} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - - echo "${DOCKER_USERNAME}" | docker login --username ${DOCKER_USERNAME} --password-stdin ${DOCKER_URL} + - echo "${DOCKER_USERNAME}" | docker login "${DOCKER_URL}" --username "${DOCKER_USERNAME}" --password-stdin - docker push opencloudeu/s3cmd From 672af224d82a8de1bd0cecc440fd6bf6173f8db1 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 10:04:22 +0200 Subject: [PATCH 21/31] pipeline test --- .woodpecker/build-s3cmd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 3869613..48fe1bb 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -42,5 +42,5 @@ steps: - ${socket_mount} commands: - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - - echo "${DOCKER_USERNAME}" | docker login "${DOCKER_URL}" --username "${DOCKER_USERNAME}" --password-stdin + - echo "${QUAY_USERNAME}" | docker login "${QUAY_URL}" --username "${QUAY_USERNAME}" --password-stdin - docker push opencloudeu/s3cmd From 876f986ad157c40fc4a9bd06549e095095c1fcfd Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 11:45:02 +0200 Subject: [PATCH 22/31] pipeline test --- .woodpecker/build-s3cmd.yml | 34 ++++++++++++++++++++++++---------- .woodpecker/build.ps1 | 17 +++++++++++++++++ .woodpecker/build.sh | 17 +++++++++++++++++ 3 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 .woodpecker/build.ps1 create mode 100644 .woodpecker/build.sh diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 48fe1bb..91075c7 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -1,14 +1,15 @@ --- variables: - - DOCKER_URL: "docker.io" - - DOCKER_USERNAME: + - &build_vars + DOCKER_URL: "docker.io" + DOCKER_USERNAME: from_secret: docker_username - - DOCKER_PASSWORD: + DOCKER_PASSWORD: from_secret: docker_password - - QUAY_URL: "quay.io" - - QUAY_USERNAME: + QUAY_URL: "quay.io" + QUAY_USERNAME: from_secret: quay_username - - QUAY_PASSWORD: + QUAY_PASSWORD: from_secret: quay_password when: @@ -36,11 +37,24 @@ clone: image: ${clone_image} steps: - - name: build + - name: build windows + when: + - matrix: + platform: windows/amd64 image: ${build_image} volumes: - ${socket_mount} + environment: *build_vars commands: - - docker build s3cmd -f s3cmd/Dockerfile -t opencloudeu/s3cmd - - echo "${QUAY_USERNAME}" | docker login "${QUAY_URL}" --username "${QUAY_USERNAME}" --password-stdin - - docker push opencloudeu/s3cmd + - build.ps1 + + - name: build linux + when: + - matrix: + platform: linux/amd64 + image: ${build_image} + volumes: + - ${socket_mount} + environment: *build_vars + commands: + - build.sh diff --git a/.woodpecker/build.ps1 b/.woodpecker/build.ps1 new file mode 100644 index 0000000..2a02080 --- /dev/null +++ b/.woodpecker/build.ps1 @@ -0,0 +1,17 @@ +echo "$env:DOCKER_PASSWORD" | docker login $env:DOCKER_URL --username "$env:DOCKER_USERNAME" --password-stdin +echo "$env:QUAY_PASSWORD" | docker login "$env:QUAY_URL" --username "$env:QUAY_USERNAME" --password-stdin +cd ../s3cmd +$date = get-date -format FileDate +docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 +docker tag opencloudeu/s3cmd:v$date $env:DOCKER_URL/opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date $env:DOCKER_URL/opencloudeu/s3cmd:v1 +docker tag opencloudeu/s3cmd:v$date $env:QUAY_URL/opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date $env:QUAY_URL/opencloudeu/s3cmd:v1 + +docker push opencloudeu/s3cmd:v$date +docker push opencloudeu/s3cmd:v1 +docker push $env:DOCKER_URL/opencloudeu/s3cmd:v$date +docker push $env:DOCKER_URL/opencloudeu/s3cmd:v1 +docker push $env:QUAY_URL/opencloudeu/s3cmd:v$date +docker push $env:QUAY_URL/opencloudeu/s3cmd:v1 diff --git a/.woodpecker/build.sh b/.woodpecker/build.sh new file mode 100644 index 0000000..9bfc115 --- /dev/null +++ b/.woodpecker/build.sh @@ -0,0 +1,17 @@ +echo "DOCKER_PASSWORD" | docker login DOCKER_URL --username "DOCKER_USERNAME" --password-stdin +echo "QUAY_PASSWORD" | docker login "QUAY_URL" --username "QUAY_USERNAME" --password-stdin +cd ../s3cmd +date=$(date +%Y%m%d) +docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 +docker tag opencloudeu/s3cmd:v$date DOCKER_URL/opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date DOCKER_URL/opencloudeu/s3cmd:v1 +docker tag opencloudeu/s3cmd:v$date QUAY_URL/opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date QUAY_URL/opencloudeu/s3cmd:v1 + +docker push opencloudeu/s3cmd:v$date +docker push opencloudeu/s3cmd:v1 +docker push DOCKER_URL/opencloudeu/s3cmd:v$date +docker push DOCKER_URL/opencloudeu/s3cmd:v1 +docker push QUAY_URL/opencloudeu/s3cmd:v$date +docker push QUAY_URL/opencloudeu/s3cmd:v1 From abe7d7319832e73f74fcf491627b1a12d4c8fcb5 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 11:45:48 +0200 Subject: [PATCH 23/31] pipeline test --- .woodpecker/build-s3cmd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 91075c7..ad1db9a 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -46,7 +46,7 @@ steps: - ${socket_mount} environment: *build_vars commands: - - build.ps1 + - .woodpecker/build.ps1 - name: build linux when: @@ -57,4 +57,4 @@ steps: - ${socket_mount} environment: *build_vars commands: - - build.sh + - .woodpecker/build.sh From 6e3f245ddce973edd5e7165ef25a8b7ba025f719 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 11:46:51 +0200 Subject: [PATCH 24/31] pipeline test --- .woodpecker/build-s3cmd.yml | 2 +- .woodpecker/build.ps1 | 2 +- .woodpecker/build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index ad1db9a..fc951f5 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -57,4 +57,4 @@ steps: - ${socket_mount} environment: *build_vars commands: - - .woodpecker/build.sh + - sh .woodpecker/build.sh diff --git a/.woodpecker/build.ps1 b/.woodpecker/build.ps1 index 2a02080..347c7b3 100644 --- a/.woodpecker/build.ps1 +++ b/.woodpecker/build.ps1 @@ -1,6 +1,6 @@ echo "$env:DOCKER_PASSWORD" | docker login $env:DOCKER_URL --username "$env:DOCKER_USERNAME" --password-stdin echo "$env:QUAY_PASSWORD" | docker login "$env:QUAY_URL" --username "$env:QUAY_USERNAME" --password-stdin -cd ../s3cmd +cd s3cmd $date = get-date -format FileDate docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 diff --git a/.woodpecker/build.sh b/.woodpecker/build.sh index 9bfc115..11bc00c 100644 --- a/.woodpecker/build.sh +++ b/.woodpecker/build.sh @@ -1,6 +1,6 @@ echo "DOCKER_PASSWORD" | docker login DOCKER_URL --username "DOCKER_USERNAME" --password-stdin echo "QUAY_PASSWORD" | docker login "QUAY_URL" --username "QUAY_USERNAME" --password-stdin -cd ../s3cmd +cd s3cmd date=$(date +%Y%m%d) docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 From 2acfe3180e547d802a9818788f76c5d4e180f072 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 11:54:33 +0200 Subject: [PATCH 25/31] pipeline test --- .woodpecker/build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker/build.sh b/.woodpecker/build.sh index 11bc00c..36dd076 100644 --- a/.woodpecker/build.sh +++ b/.woodpecker/build.sh @@ -1,13 +1,13 @@ -echo "DOCKER_PASSWORD" | docker login DOCKER_URL --username "DOCKER_USERNAME" --password-stdin -echo "QUAY_PASSWORD" | docker login "QUAY_URL" --username "QUAY_USERNAME" --password-stdin +echo "$DOCKER_PASSWORD" | docker login "$DOCKER_URL" --username "$DOCKER_USERNAME" --password-stdin +echo "$QUAY_PASSWORD" | docker login "$QUAY_URL" --username "$QUAY_USERNAME" --password-stdin cd s3cmd date=$(date +%Y%m%d) docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 -docker tag opencloudeu/s3cmd:v$date DOCKER_URL/opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date DOCKER_URL/opencloudeu/s3cmd:v1 -docker tag opencloudeu/s3cmd:v$date QUAY_URL/opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date QUAY_URL/opencloudeu/s3cmd:v1 +docker tag opencloudeu/s3cmd:v$date $DOCKER_URL/opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date $DOCKER_URL/opencloudeu/s3cmd:v1 +docker tag opencloudeu/s3cmd:v$date $QUAY_URL/opencloudeu/s3cmd:v$date +docker tag opencloudeu/s3cmd:v$date $QUAY_URL/opencloudeu/s3cmd:v1 docker push opencloudeu/s3cmd:v$date docker push opencloudeu/s3cmd:v1 From 4b6d2b5ddd6fb5d439ec4fc77e905086be34fa25 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 11:58:52 +0200 Subject: [PATCH 26/31] pipeline test --- .woodpecker/build.ps1 | 4 ++-- .woodpecker/build.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker/build.ps1 b/.woodpecker/build.ps1 index 347c7b3..f12d2d3 100644 --- a/.woodpecker/build.ps1 +++ b/.woodpecker/build.ps1 @@ -1,5 +1,5 @@ -echo "$env:DOCKER_PASSWORD" | docker login $env:DOCKER_URL --username "$env:DOCKER_USERNAME" --password-stdin -echo "$env:QUAY_PASSWORD" | docker login "$env:QUAY_URL" --username "$env:QUAY_USERNAME" --password-stdin +docker login $env:DOCKER_URL --username "$env:DOCKER_USERNAME" --password "$env:DOCKER_PASSWORD" +docker login "$env:QUAY_URL" --username "$env:QUAY_USERNAME" --password "$env:QUAY_PASSWORD" cd s3cmd $date = get-date -format FileDate docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date diff --git a/.woodpecker/build.sh b/.woodpecker/build.sh index 36dd076..6947cd3 100644 --- a/.woodpecker/build.sh +++ b/.woodpecker/build.sh @@ -11,7 +11,7 @@ docker tag opencloudeu/s3cmd:v$date $QUAY_URL/opencloudeu/s3cmd:v1 docker push opencloudeu/s3cmd:v$date docker push opencloudeu/s3cmd:v1 -docker push DOCKER_URL/opencloudeu/s3cmd:v$date -docker push DOCKER_URL/opencloudeu/s3cmd:v1 -docker push QUAY_URL/opencloudeu/s3cmd:v$date -docker push QUAY_URL/opencloudeu/s3cmd:v1 +docker push $DOCKER_URL/opencloudeu/s3cmd:v$date +docker push $DOCKER_URL/opencloudeu/s3cmd:v1 +docker push $QUAY_URL/opencloudeu/s3cmd:v$date +docker push $QUAY_URL/opencloudeu/s3cmd:v1 From 5deaa8bc5624e7a9677c00cc263cfcb39484462b Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 12:04:59 +0200 Subject: [PATCH 27/31] pipeline test --- .woodpecker/build-s3cmd.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index fc951f5..06a5630 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -14,8 +14,11 @@ variables: when: - event: push - branch: "add_s3cmd" + path: 's3cmd/*' + - event: pull_request + path: 's3cmd/*' - event: manual + - event: cron matrix: include: From 7eccddae01805cd9c20dfe6ad2d25294a33242e1 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 12:27:01 +0200 Subject: [PATCH 28/31] added manifests for multiplatform push --- .woodpecker/build.ps1 | 44 ++++++++++++++++++++++++++++--------------- .woodpecker/build.sh | 34 ++++++++++++++++++++------------- 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/.woodpecker/build.ps1 b/.woodpecker/build.ps1 index f12d2d3..180f91a 100644 --- a/.woodpecker/build.ps1 +++ b/.woodpecker/build.ps1 @@ -1,17 +1,31 @@ -docker login $env:DOCKER_URL --username "$env:DOCKER_USERNAME" --password "$env:DOCKER_PASSWORD" -docker login "$env:QUAY_URL" --username "$env:QUAY_USERNAME" --password "$env:QUAY_PASSWORD" -cd s3cmd $date = get-date -format FileDate -docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 -docker tag opencloudeu/s3cmd:v$date $env:DOCKER_URL/opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date $env:DOCKER_URL/opencloudeu/s3cmd:v1 -docker tag opencloudeu/s3cmd:v$date $env:QUAY_URL/opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date $env:QUAY_URL/opencloudeu/s3cmd:v1 +$DOCKER_URL = $env:DOCKER_URL +$DOCKER_USERNAME = $env:DOCKER_USERNAME +$DOCKER_PASSWORD = $env:DOCKER_PASSWORD +$QUAY_URL = $env:QUAY_URL +$QUAY_USERNAME = $env:QUAY_USERNAME +$QUAY_PASSWORD = $env:QUAY_PASSWORD + +docker login $DOCKER_URL --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD" +docker login "$QUAY_URL" --username "$QUAY_USERNAME" --password "$QUAY_PASSWORD" +cd s3cmd +docker build . -f Dockerfile -t opencloudeu/s3cmd:w-v$date +docker tag opencloudeu/s3cmd:w-v$date opencloudeu/s3cmd:w-v1 +docker tag opencloudeu/s3cmd:w-v$date $DOCKER_URL/opencloudeu/s3cmd:w-v$date +docker tag opencloudeu/s3cmd:w-v$date $DOCKER_URL/opencloudeu/s3cmd:w-v1 +docker tag opencloudeu/s3cmd:w-v$date $QUAY_URL/opencloudeu/s3cmd:w-v$date +docker tag opencloudeu/s3cmd:w-v$date $QUAY_URL/opencloudeu/s3cmd:w-v1 + +docker push opencloudeu/s3cmd:w-v$date +docker push opencloudeu/s3cmd:w-v1 +docker push $DOCKER_URL/opencloudeu/s3cmd:w-v$date +docker push $DOCKER_URL/opencloudeu/s3cmd:w-v1 +docker push $QUAY_URL/opencloudeu/s3cmd:w-v$date +docker push $QUAY_URL/opencloudeu/s3cmd:w-v1 -docker push opencloudeu/s3cmd:v$date -docker push opencloudeu/s3cmd:v1 -docker push $env:DOCKER_URL/opencloudeu/s3cmd:v$date -docker push $env:DOCKER_URL/opencloudeu/s3cmd:v1 -docker push $env:QUAY_URL/opencloudeu/s3cmd:v$date -docker push $env:QUAY_URL/opencloudeu/s3cmd:v1 +docker manifest create -a opencloudeu/s3cmd:v1 opencloudeu/s3cmd:l-v1 opencloudeu/s3cmd:w-v1 +docker manifest create -a $DOCKER_URL/opencloudeu/s3cmd:v1 $DOCKER_URL/opencloudeu/s3cmd:l-v1 $DOCKER_URL/opencloudeu/s3cmd:w-v1 +docker manifest create -a $QUAY_URL/opencloudeu/s3cmd:v1 $QUAY_URL/opencloudeu/s3cmd:l-v1 $QUAY_URL/opencloudeu/s3cmd:w-v1 +docker manifest push opencloudeu/s3cmd:v1 +docker manifest push $DOCKER_URL/opencloudeu/s3cmd:v1 +docker manifest push $env:QUAY_URL/opencloudeu/s3cmd:v1 diff --git a/.woodpecker/build.sh b/.woodpecker/build.sh index 6947cd3..4450c5e 100644 --- a/.woodpecker/build.sh +++ b/.woodpecker/build.sh @@ -1,17 +1,25 @@ +date=$(date +%Y%m%d) + echo "$DOCKER_PASSWORD" | docker login "$DOCKER_URL" --username "$DOCKER_USERNAME" --password-stdin echo "$QUAY_PASSWORD" | docker login "$QUAY_URL" --username "$QUAY_USERNAME" --password-stdin cd s3cmd -date=$(date +%Y%m%d) -docker build . -f Dockerfile -t opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date opencloudeu/s3cmd:v1 -docker tag opencloudeu/s3cmd:v$date $DOCKER_URL/opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date $DOCKER_URL/opencloudeu/s3cmd:v1 -docker tag opencloudeu/s3cmd:v$date $QUAY_URL/opencloudeu/s3cmd:v$date -docker tag opencloudeu/s3cmd:v$date $QUAY_URL/opencloudeu/s3cmd:v1 +docker build . -f Dockerfile -t opencloudeu/s3cmd:l-v$date +docker tag opencloudeu/s3cmd:l-v$date opencloudeu/s3cmd:l-v1 +docker tag opencloudeu/s3cmd:l-v$date $DOCKER_URL/opencloudeu/s3cmd:l-v$date +docker tag opencloudeu/s3cmd:l-v$date $DOCKER_URL/opencloudeu/s3cmd:l-v1 +docker tag opencloudeu/s3cmd:l-v$date $QUAY_URL/opencloudeu/s3cmd:l-v$date +docker tag opencloudeu/s3cmd:l-v$date $QUAY_URL/opencloudeu/s3cmd:l-v1 + +docker push opencloudeu/s3cmd:l-v$date +docker push opencloudeu/s3cmd:l-v1 +docker push $DOCKER_URL/opencloudeu/s3cmd:l-v$date +docker push $DOCKER_URL/opencloudeu/s3cmd:l-v1 +docker push $QUAY_URL/opencloudeu/s3cmd:l-v$date +docker push $QUAY_URL/opencloudeu/s3cmd:l-v1 -docker push opencloudeu/s3cmd:v$date -docker push opencloudeu/s3cmd:v1 -docker push $DOCKER_URL/opencloudeu/s3cmd:v$date -docker push $DOCKER_URL/opencloudeu/s3cmd:v1 -docker push $QUAY_URL/opencloudeu/s3cmd:v$date -docker push $QUAY_URL/opencloudeu/s3cmd:v1 +docker manifest create -a opencloudeu/s3cmd:v1 opencloudeu/s3cmd:l-v1 opencloudeu/s3cmd:w-v1 +docker manifest create -a $DOCKER_URL/opencloudeu/s3cmd:v1 $DOCKER_URL/opencloudeu/s3cmd:l-v1 $DOCKER_URL/opencloudeu/s3cmd:w-v1 +docker manifest create -a $QUAY_URL/opencloudeu/s3cmd:v1 $QUAY_URL/opencloudeu/s3cmd:l-v1 $QUAY_URL/opencloudeu/s3cmd:w-v1 +docker manifest push opencloudeu/s3cmd:v1 +docker manifest push $DOCKER_URL/opencloudeu/s3cmd:v1 +docker manifest push $QUAY_URL/opencloudeu/s3cmd:v1 \ No newline at end of file From 194959879f5ea22c31d4110f68788a8fdb6725a1 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 12:27:01 +0200 Subject: [PATCH 29/31] added manifests for multiplatform push --- .woodpecker/build-s3cmd.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 06a5630..3891f6f 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -15,8 +15,6 @@ variables: when: - event: push path: 's3cmd/*' - - event: pull_request - path: 's3cmd/*' - event: manual - event: cron From 199f07727ca1ed074235a8213c7e519d99d2ebc5 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 12:27:01 +0200 Subject: [PATCH 30/31] added manifests for multiplatform push --- .woodpecker/build-s3cmd.yml | 1 - .woodpecker/build.ps1 | 11 +++++++---- .woodpecker/build.sh | 9 ++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 3891f6f..49bc990 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -15,7 +15,6 @@ variables: when: - event: push path: 's3cmd/*' - - event: manual - event: cron matrix: diff --git a/.woodpecker/build.ps1 b/.woodpecker/build.ps1 index 180f91a..c6951f3 100644 --- a/.woodpecker/build.ps1 +++ b/.woodpecker/build.ps1 @@ -6,9 +6,10 @@ $QUAY_URL = $env:QUAY_URL $QUAY_USERNAME = $env:QUAY_USERNAME $QUAY_PASSWORD = $env:QUAY_PASSWORD -docker login $DOCKER_URL --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD" +docker login "$DOCKER_URL" --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD" docker login "$QUAY_URL" --username "$QUAY_USERNAME" --password "$QUAY_PASSWORD" cd s3cmd + docker build . -f Dockerfile -t opencloudeu/s3cmd:w-v$date docker tag opencloudeu/s3cmd:w-v$date opencloudeu/s3cmd:w-v1 docker tag opencloudeu/s3cmd:w-v$date $DOCKER_URL/opencloudeu/s3cmd:w-v$date @@ -24,8 +25,10 @@ docker push $QUAY_URL/opencloudeu/s3cmd:w-v$date docker push $QUAY_URL/opencloudeu/s3cmd:w-v1 docker manifest create -a opencloudeu/s3cmd:v1 opencloudeu/s3cmd:l-v1 opencloudeu/s3cmd:w-v1 -docker manifest create -a $DOCKER_URL/opencloudeu/s3cmd:v1 $DOCKER_URL/opencloudeu/s3cmd:l-v1 $DOCKER_URL/opencloudeu/s3cmd:w-v1 -docker manifest create -a $QUAY_URL/opencloudeu/s3cmd:v1 $QUAY_URL/opencloudeu/s3cmd:l-v1 $QUAY_URL/opencloudeu/s3cmd:w-v1 docker manifest push opencloudeu/s3cmd:v1 + +docker manifest create -a $DOCKER_URL/opencloudeu/s3cmd:v1 $DOCKER_URL/opencloudeu/s3cmd:l-v1 $DOCKER_URL/opencloudeu/s3cmd:w-v1 docker manifest push $DOCKER_URL/opencloudeu/s3cmd:v1 -docker manifest push $env:QUAY_URL/opencloudeu/s3cmd:v1 + +docker manifest create -a $QUAY_URL/opencloudeu/s3cmd:v1 $QUAY_URL/opencloudeu/s3cmd:l-v1 $QUAY_URL/opencloudeu/s3cmd:w-v1 +docker manifest push $QUAY_URL/opencloudeu/s3cmd:v1 diff --git a/.woodpecker/build.sh b/.woodpecker/build.sh index 4450c5e..120559c 100644 --- a/.woodpecker/build.sh +++ b/.woodpecker/build.sh @@ -3,6 +3,7 @@ date=$(date +%Y%m%d) echo "$DOCKER_PASSWORD" | docker login "$DOCKER_URL" --username "$DOCKER_USERNAME" --password-stdin echo "$QUAY_PASSWORD" | docker login "$QUAY_URL" --username "$QUAY_USERNAME" --password-stdin cd s3cmd + docker build . -f Dockerfile -t opencloudeu/s3cmd:l-v$date docker tag opencloudeu/s3cmd:l-v$date opencloudeu/s3cmd:l-v1 docker tag opencloudeu/s3cmd:l-v$date $DOCKER_URL/opencloudeu/s3cmd:l-v$date @@ -18,8 +19,10 @@ docker push $QUAY_URL/opencloudeu/s3cmd:l-v$date docker push $QUAY_URL/opencloudeu/s3cmd:l-v1 docker manifest create -a opencloudeu/s3cmd:v1 opencloudeu/s3cmd:l-v1 opencloudeu/s3cmd:w-v1 -docker manifest create -a $DOCKER_URL/opencloudeu/s3cmd:v1 $DOCKER_URL/opencloudeu/s3cmd:l-v1 $DOCKER_URL/opencloudeu/s3cmd:w-v1 -docker manifest create -a $QUAY_URL/opencloudeu/s3cmd:v1 $QUAY_URL/opencloudeu/s3cmd:l-v1 $QUAY_URL/opencloudeu/s3cmd:w-v1 docker manifest push opencloudeu/s3cmd:v1 + +docker manifest create -a $DOCKER_URL/opencloudeu/s3cmd:v1 $DOCKER_URL/opencloudeu/s3cmd:l-v1 $DOCKER_URL/opencloudeu/s3cmd:w-v1 docker manifest push $DOCKER_URL/opencloudeu/s3cmd:v1 -docker manifest push $QUAY_URL/opencloudeu/s3cmd:v1 \ No newline at end of file + +docker manifest create -a $QUAY_URL/opencloudeu/s3cmd:v1 $QUAY_URL/opencloudeu/s3cmd:l-v1 $QUAY_URL/opencloudeu/s3cmd:w-v1 +docker manifest push $QUAY_URL/opencloudeu/s3cmd:v1 From 5963739f740d47485bbfdba6048049174993a761 Mon Sep 17 00:00:00 2001 From: Michael 'Flimmy' Flemming Date: Tue, 5 Aug 2025 14:39:20 +0200 Subject: [PATCH 31/31] added .woodpecker to when path --- .woodpecker/build-s3cmd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/build-s3cmd.yml b/.woodpecker/build-s3cmd.yml index 49bc990..381bcd9 100644 --- a/.woodpecker/build-s3cmd.yml +++ b/.woodpecker/build-s3cmd.yml @@ -15,6 +15,8 @@ variables: when: - event: push path: 's3cmd/*' + - event: push + path: '.woodpecker/*' - event: cron matrix: