From 2a5ba2959172bba4f38e8c8fe29617628b1f654e Mon Sep 17 00:00:00 2001 From: Ivan Schaller Date: Fri, 20 May 2022 22:17:12 +0200 Subject: [PATCH] change from drone to woodpecker and update baseimage --- .drone.yml | 110 --------------------------------- .gitignore | 3 +- .woodpecker/build_docker.yml | 45 ++++++++++++++ .woodpecker/publish_docker.yml | 67 ++++++++++++++++++++ Dockerfile.amd64 | 2 +- Dockerfile.arm64 | 2 +- README.md | 2 +- 7 files changed, 117 insertions(+), 114 deletions(-) delete mode 100644 .drone.yml create mode 100644 .woodpecker/build_docker.yml create mode 100644 .woodpecker/publish_docker.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 0596318..0000000 --- a/.drone.yml +++ /dev/null @@ -1,110 +0,0 @@ -################ -# docker build # -################ -kind: pipeline -type: docker -name: docker-build-amd64 - -platform: - os: linux - arch: amd64 - -trigger: - event: - - tag - -# anchors -cr_secrets: &cr_secrets - username: - from_secret: cr-dhub-username - password: - from_secret: cr-dhub-key - -docker_build: &docker_build - image: plugins/docker - pull: if-not-exists - group: build - -# build steps amd64 -steps: -- name: 'build and publish docker image' - <<: *docker_build - settings: - repo: olofvndrhr/flox-dockerized - dockerfile: Dockerfile.amd64 - auto_tag: true - auto_tag_suffix: linux-amd64 - <<: *cr_secrets - - ---- -kind: pipeline -type: docker -name: docker-build-arm64 - -platform: - os: linux - arch: arm64 - -trigger: - event: - - tag - -# anchors -cr_secrets: &cr_secrets - username: - from_secret: cr-dhub-username - password: - from_secret: cr-dhub-key - -docker_build: &docker_build - image: plugins/docker - pull: if-not-exists - group: build - -# build steps arm64 -steps: -- name: 'build and publish docker image' - <<: *docker_build - settings: - repo: olofvndrhr/flox-dockerized - dockerfile: Dockerfile.arm64 - auto_tag: true - auto_tag_suffix: linux-arm64 - <<: *cr_secrets - - ---- -kind: pipeline -type: docker -name: docker-publish-manifest - -platform: - os: linux - arch: amd64 - -trigger: - event: - - tag - -# anchors -cr_secrets: &cr_secrets - username: - from_secret: cr-dhub-username - password: - from_secret: cr-dhub-key - -# build steps -steps: -- name: 'publish manifest' - image: plugins/manifest - settings: - spec: manifest.tmpl - auto_tag: true - ignore_missing: true - <<: *cr_secrets - -depends_on: - - docker-build-amd64 - - docker-build-arm64 - diff --git a/.gitignore b/.gitignore index b59f7e3..1c63865 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -test/ \ No newline at end of file +test/ +.idea/ \ No newline at end of file diff --git a/.woodpecker/build_docker.yml b/.woodpecker/build_docker.yml new file mode 100644 index 0000000..e7f7387 --- /dev/null +++ b/.woodpecker/build_docker.yml @@ -0,0 +1,45 @@ +####################### +# build docker images # +####################### +# branch: master +# event: pull_request + +clone: + git: + when: + branch: master + event: pull_request + image: woodpeckerci/plugin-git + +pipeline: + + # build docker image for amd64 - x86 + dryrun-build-amd64: + when: + branch: master + event: pull_request + image: olofvndrhr/flox-dockerized + pull: true + settings: + dry_run: true + repo: olofvndrhr/manga-dlp + platforms: linux/amd64 + dockerfile: Dockerfile.amd64 + auto_tag: true + auto_tag_suffix: linux-amd64 + + # build docker image for arm64 + dryrun-build-arm64: + when: + branch: master + event: pull_request + image: olofvndrhr/flox-dockerized + pull: true + settings: + dry_run: true + repo: olofvndrhr/manga-dlp + platforms: linux/arm64 + dockerfile: Dockerfile.arm64 + auto_tag: true + auto_tag_suffix: linux-arm64 + diff --git a/.woodpecker/publish_docker.yml b/.woodpecker/publish_docker.yml new file mode 100644 index 0000000..49206bb --- /dev/null +++ b/.woodpecker/publish_docker.yml @@ -0,0 +1,67 @@ +################################### +# build and publish docker images # +################################### +# branch: master +# event: tag + +clone: + git: + when: + #branch: master + event: tag + image: woodpeckerci/plugin-git + +pipeline: + + # build and publish docker image for amd64 - x86 + build-amd64: + when: + #branch: master + event: tag + image: woodpeckerci/plugin-docker-buildx + pull: true + settings: + repo: olofvndrhr/flox-dockerized + platforms: linux/amd64 + dockerfile: Dockerfile.amd64 + auto_tag: true + auto_tag_suffix: linux-amd64 + username: + from_secret: cr-dhub-username + password: + from_secret: cr-dhub-key + + # build and publish docker image for arm64 + build-arm64: + when: + #branch: master + event: tag + image: woodpeckerci/plugin-docker-buildx + pull: true + settings: + repo: olofvndrhr/flox-dockerized + platforms: linux/arm64 + dockerfile: Dockerfile.arm64 + auto_tag: true + auto_tag_suffix: linux-arm64 + username: + from_secret: cr-dhub-username + password: + from_secret: cr-dhub-key + + # publish docker manifest for automatic multi arch pulls + publish-manifest: + when: + #branch: master + event: tag + image: plugins/manifest + pull: true + settings: + spec: manifest.tmpl + auto_tag: true + ignore_missing: true + username: + from_secret: cr-dhub-username + password: + from_secret: cr-dhub-key + diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 7a9d6e2..09855b9 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -10,7 +10,7 @@ RUN \ ########################################### -FROM cr.44net.ch/baseimages/debian-s6:1.3.1 +FROM cr.44net.ch/baseimages/debian-s6:1.3.5 # set version label ARG BUILD_DATE diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 7a9d6e2..09855b9 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -10,7 +10,7 @@ RUN \ ########################################### -FROM cr.44net.ch/baseimages/debian-s6:1.3.1 +FROM cr.44net.ch/baseimages/debian-s6:1.3.5 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index 66fae54..caa406e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # flox-dockerized -[![Build Status](https://drone.44net.ch/api/badges/olofvndrhr/flox-dockerized/status.svg)](https://drone.44net.ch/olofvndrhr/flox-dockerized) +[![status-badge](https://ci.44net.ch/api/badges/olofvndrhr/flox-dockerized/status.svg)](https://ci.44net.ch/olofvndrhr/flox-dockerized) ### This is a docker container for the flox watchlist. Be sure to check out the original project: https://github.com/devfake/flox