From 002b84edc00cde4beb51573efa541c0c77aabd87 Mon Sep 17 00:00:00 2001 From: ezkrg Date: Tue, 5 Apr 2022 16:07:40 +0200 Subject: use plugin verions at build time --- .drone.yml | 18 +++++++++++++----- Dockerfile | 28 ++++++++++++++-------------- Dockerfile.debian | 30 +++++++++++++++--------------- plugin_versions | 15 +++++++++++++++ 4 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 plugin_versions diff --git a/.drone.yml b/.drone.yml index 3a5c21c..5668688 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,9 @@ steps: - while ! docker info; do sleep 1; done - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST - echo $PASSWORD | docker login --username $USER --password-stdin - - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:test --platform linux/amd64 . + - apk add --update --no-cache bash + - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done) + - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:test --platform linux/amd64 $BUILD_ARGS . when: event: - push @@ -39,7 +41,9 @@ steps: - while ! docker info; do sleep 1; done - docker buildx create --use --name docker --node docker --platform linux/amd64--driver docker-container $DOCKER_HOST - echo $PASSWORD | docker login --username $USER --password-stdin - - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:$DRONE_TAG -t ezkrg/bitlbee-libpurple:latest --platform linux/amd64 . + - apk add --update --no-cache bash + - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done) + - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:$DRONE_TAG -t ezkrg/bitlbee-libpurple:latest --platform linux/amd64 $BUILD_ARGS . when: event: - tag @@ -70,7 +74,9 @@ steps: - docker run --rm --privileged tonistiigi/binfmt --install all - docker buildx create --use --name docker --node docker --platform linux/amd64,linux/arm64,linux/armhf --driver docker-container $DOCKER_HOST - echo $PASSWORD | docker login --username $USER --password-stdin - - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache -t ezkrg/bitlbee-libpurple:debian-test --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian . + - apk add --update --no-cache bash + - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done) + - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache -t ezkrg/bitlbee-libpurple:debian-test --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian $BUILD_ARGS . when: event: - push @@ -88,7 +94,9 @@ steps: - docker run --rm --privileged tonistiigi/binfmt --install all - docker buildx create --use --name docker --node docker --platform linux/amd64,linux/arm64,linux/armhf --driver docker-container $DOCKER_HOST - echo $PASSWORD | docker login --username $USER --password-stdin - - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache -t ezkrg/bitlbee-libpurple:debian-$DRONE_TAG -t ezkrg/bitlbee-libpurple:debian-latest --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian . + - apk add --update --no-cache bash + - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done) + - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache -t ezkrg/bitlbee-libpurple:debian-$DRONE_TAG -t ezkrg/bitlbee-libpurple:debian-latest --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian $BUILD_ARGS . when: event: - tag @@ -127,6 +135,6 @@ depends_on: --- kind: signature -hmac: d6be935aac30edc801babe2b7daae15dc913d2751da9f43696fbb8eece1a05d7 +hmac: e0882d0997cb22942e951216e97d9ac96eed4810191ebd0bbcb8781912428000 ... diff --git a/Dockerfile b/Dockerfile index 2f025ff..cce9036 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.15 as base-image FROM base-image as bitlbee-build -ARG BITLBEE_VERSION=3.6 +ARG BITLBEE_VERSION RUN apk add --no-cache --update \ bash shadow build-base git python2 autoconf automake libtool mercurial intltool flex \ @@ -40,7 +40,7 @@ RUN echo OTR=${OTR} > /tmp/status \ FROM bitlbee-build as facebook-build ARG FACEBOOK=1 -ARG FACEBOOK_VERSION=v1.2.2 +ARG FACEBOOK_VERSION RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \ && if [ ${FACEBOOK} -eq 1 ]; \ @@ -62,7 +62,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \ FROM bitlbee-build as steam-build ARG STEAM=1 -ARG STEAM_VERSION=a6444d2 +ARG STEAM_VERSION RUN echo STEAM=${STEAM} > /tmp/status \ && if [ ${STEAM} -eq 1 ]; \ @@ -84,7 +84,7 @@ RUN echo STEAM=${STEAM} > /tmp/status \ FROM bitlbee-build as skypeweb-build ARG SKYPEWEB=1 -ARG SKYPEWEB_VERSION=c4906b8 +ARG SKYPEWEB_VERSION RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \ && if [ ${SKYPEWEB} -eq 1 ]; \ @@ -105,7 +105,7 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \ FROM bitlbee-build as telegram-build ARG TELEGRAM=1 -ARG TELEGRAM_VERSION=v1.4.3 +ARG TELEGRAM_VERSION RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \ && if [ ${TELEGRAM} -eq 1 ]; \ @@ -129,7 +129,7 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \ FROM bitlbee-build as hangouts-build ARG HANGOUTS=1 -ARG HANGOUTS_VERSION=e8c8088 +ARG HANGOUTS_VERSION RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \ && if [ ${HANGOUTS} -eq 1 ]; \ @@ -149,7 +149,7 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \ FROM bitlbee-build as slack-build ARG SLACK=1 -ARG SLACK_VERSION=e0c73ae +ARG SLACK_VERSION SHELL [ "/bin/bash", "-c" ] @@ -172,7 +172,7 @@ RUN echo SLACK=${SLACK} > /tmp/status \ FROM bitlbee-build as sipe-build ARG SIPE=1 -ARG SIPE_VERSION=3db5111 +ARG SIPE_VERSION RUN echo SIPE=${SIPE} > /tmp/status \ && if [ ${SIPE} -eq 1 ]; \ @@ -196,7 +196,7 @@ RUN echo SIPE=${SIPE} > /tmp/status \ FROM bitlbee-build as discord-build ARG DISCORD=1 -ARG DISCORD_VERSION=0.4.3 +ARG DISCORD_VERSION RUN echo DISCORD=${DISCORD} > /tmp/status \ && if [ ${DISCORD} -eq 1 ]; \ @@ -220,7 +220,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \ FROM bitlbee-build as rocketchat-build ARG ROCKETCHAT=1 -ARG ROCKETCHAT_VERSION=62090bc +ARG ROCKETCHAT_VERSION RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \ && if [ ${ROCKETCHAT} -eq 1 ]; \ @@ -240,7 +240,7 @@ RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \ FROM bitlbee-build as mastodon-build ARG MASTODON=1 -ARG MASTODON_VERSION=v1.4.4 +ARG MASTODON_VERSION RUN echo MASTODON=${MASTODON} > /tmp/status \ && if [ ${MASTODON} -eq 1 ]; \ @@ -264,7 +264,7 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \ FROM bitlbee-build as matrix-build ARG MATRIX=1 -ARG MATRIX_VERSION=88f9558 +ARG MATRIX_VERSION RUN echo MATRIX=${MATRIX} > /tmp/status \ && if [ ${MATRIX} -eq 1 ]; \ @@ -284,7 +284,7 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \ FROM bitlbee-build as signald-build ARG SIGNAL=1 -ARG SIGNAL_VERSION=v0.8.1 +ARG SIGNAL_VERSION RUN echo SIGNAL=${SIGNAL} > /tmp/status \ && if [ ${SIGNAL} -eq 1 ]; \ @@ -307,7 +307,7 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \ FROM bitlbee-build as icyque-build ARG ICYQUE=1 -ARG ICYQUE_VERSION=4fc08a0 +ARG ICYQUE_VERSION RUN echo ICYQUE=${ICYQUE} > /tmp/status \ && if [ ${ICYQUE} -eq 1 ]; \ diff --git a/Dockerfile.debian b/Dockerfile.debian index f58d087..b2da3f2 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -2,7 +2,7 @@ FROM debian:bullseye-slim as base-image FROM base-image as bitlbee-build -ARG BITLBEE_VERSION=3.6 +ARG BITLBEE_VERSION RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -40,7 +40,7 @@ RUN echo OTR=${OTR} > /tmp/status \ FROM bitlbee-build as facebook-build ARG FACEBOOK=1 -ARG FACEBOOK_VERSION=v1.2.2 +ARG FACEBOOK_VERSION RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \ && if [ ${FACEBOOK} -eq 1 ]; \ @@ -62,7 +62,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \ FROM bitlbee-build as steam-build ARG STEAM=1 -ARG STEAM_VERSION=a6444d2 +ARG STEAM_VERSION RUN echo STEAM=${STEAM} > /tmp/status \ && if [ ${STEAM} -eq 1 ]; \ @@ -84,7 +84,7 @@ RUN echo STEAM=${STEAM} > /tmp/status \ FROM bitlbee-build as skypeweb-build ARG SKYPEWEB=1 -ARG SKYPEWEB_VERSION=c4906b8 +ARG SKYPEWEB_VERSION RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \ && if [ ${SKYPEWEB} -eq 1 ]; \ @@ -105,7 +105,7 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \ FROM bitlbee-build as telegram-build ARG TELEGRAM=1 -ARG TELEGRAM_VERSION=v1.4.3 +ARG TELEGRAM_VERSION RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \ && if [ ${TELEGRAM} -eq 1 ]; \ @@ -131,7 +131,7 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \ FROM bitlbee-build as hangouts-build ARG HANGOUTS=1 -ARG HANGOUTS_VERSION=e8c8088 +ARG HANGOUTS_VERSION RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \ && if [ ${HANGOUTS} -eq 1 ]; \ @@ -153,7 +153,7 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \ FROM bitlbee-build as slack-build ARG SLACK=1 -ARG SLACK_VERSION=e0c73ae +ARG SLACK_VERSION SHELL [ "/bin/bash", "-c" ] @@ -176,7 +176,7 @@ RUN echo SLACK=${SLACK} > /tmp/status \ FROM bitlbee-build as sipe-build ARG SIPE=1 -ARG SIPE_VERSION=1.25.0 +ARG SIPE_VERSION RUN echo SIPE=${SIPE} > /tmp/status \ && if [ ${SIPE} -eq 1 ]; \ @@ -202,7 +202,7 @@ RUN echo SIPE=${SIPE} > /tmp/status \ FROM bitlbee-build as discord-build ARG DISCORD=1 -ARG DISCORD_VERSION=0.4.3 +ARG DISCORD_VERSION RUN echo DISCORD=${DISCORD} > /tmp/status \ && if [ ${DISCORD} -eq 1 ]; \ @@ -226,7 +226,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \ FROM bitlbee-build as rocketchat-build ARG ROCKETCHAT=1 -ARG ROCKETCHAT_VERSION=62090bc +ARG ROCKETCHAT_VERSION RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \ && if [ ${ROCKETCHAT} -eq 1 ]; \ @@ -248,7 +248,7 @@ RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \ FROM bitlbee-build as mastodon-build ARG MASTODON=1 -ARG MASTODON_VERSION=v1.4.4 +ARG MASTODON_VERSION RUN echo MASTODON=${MASTODON} > /tmp/status \ && if [ ${MASTODON} -eq 1 ]; \ @@ -272,7 +272,7 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \ FROM bitlbee-build as matrix-build ARG MATRIX=1 -ARG MATRIX_VERSION=88f9558 +ARG MATRIX_VERSION SHELL [ "/bin/bash", "-c" ] @@ -299,7 +299,7 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \ FROM bitlbee-build as signald-build ARG SIGNAL=1 -ARG SIGNAL_VERSION=v0.8.1 +ARG SIGNAL_VERSION RUN echo SIGNAL=${SIGNAL} > /tmp/status \ && if [ ${SIGNAL} -eq 1 ]; \ @@ -323,7 +323,7 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \ FROM bitlbee-build as icyque-build ARG ICYQUE=1 -ARG ICYQUE_VERSION=4fc08a0 +ARG ICYQUE_VERSION RUN echo ICYQUE=${ICYQUE} > /tmp/status \ && if [ ${ICYQUE} -eq 1 ]; \ @@ -343,7 +343,7 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \ FROM bitlbee-build as whatsapp-build ARG WHATSAPP=1 -ARG WHATSAPP_VERSION=438fae6 +ARG WHATSAPP_VERSION RUN echo WHATSAPP=${WHATSAPP} > /tmp/status \ && if [ ${WHATSAPP} -eq 1 ]; \ diff --git a/plugin_versions b/plugin_versions new file mode 100644 index 0000000..28d9550 --- /dev/null +++ b/plugin_versions @@ -0,0 +1,15 @@ +BITLBEE_VERSION=3.6 +DISCORD_VERSION=0.4.3 +FACEBOOK_VERSION=v1.2.2 +HANGOUTS_VERSION=e8c8088 +ICYQUE_VERSION=4fc08a0 +MASTODON_VERSION=v1.4.4 +MATRIX_VERSION=88f9558 +ROCKETCHAT_VERSION=62090bc +SIGNAL_VERSION=v0.8.1 +SIPE_VERSION=3db5111 +SKYPEWEB_VERSION=c4906b8 +SLACK_VERSION=e0c73ae +STEAM_VERSION=a6444d2 +TELEGRAM_VERSION=v1.4.3 +WHATSAPP_VERSION=438fae6 -- cgit v1.2.3