diff --git a/.woodpecker.yml b/.woodpecker.yml index ae87eed..9025004 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,15 +1,14 @@ pipeline: build: - secrets: [user, pass, HOMETOWN_VERSION, DOCKER_TAG] + secrets: [user, pass, GLITCH_VERSION, DOCKER_TAG] image: docker.io/docker:23-cli commands: - apk add curl git - docker login -u $USER -p $PASS dev.cat-enby.club - - HOMETOWN_VERSION=$(curl -sX GET "https://api.github.com/repos/hometown-fork/hometown/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]') - - DOCKER_TAG=$${HOMETOWN_VERSION//+} - - docker buildx build --build-arg HOMETOWN_VERSION=$HOMETOWN_VERSION -t dev.cat-enby.club/nikurasu/hometown:latest -t dev.cat-enby.club/nikurasu/hometown:$DOCKER_TAG -f ./Dockerfile . - - docker push dev.cat-enby.club/nikurasu/hometown:$DOCKER_TAG - - docker push dev.cat-enby.club/nikurasu/hometown:latest + - GLITCH_VERSION=$(date "+%Y-%m-%d") + - docker buildx build -t dev.cat-enby.club/nikurasu/mastodon-glitch:latest -t dev.cat-enby.club/nikurasu/mastodon-glitch:$GLITCH_VERSION -f ./Dockerfile . + - docker push dev.cat-enby.club/nikurasu/mastodon-glitch:$GLITCH_VERSION + - docker push dev.cat-enby.club/nikurasu/mastodon-glitch:latest volumes: - /var/run/docker.sock:/var/run/docker.sock when: diff --git a/Dockerfile b/Dockerfile index ee75abe..da1b891 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15 ARG BUILD_DATE ARG VERSION -ARG HOMETOWN_VERSION +ARG MASTODON_VERSION LABEL build_version="dev.cat-enby.club version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="Nikurasu" @@ -36,13 +36,9 @@ RUN \ ruby-dev && \ echo "**** install mastodon ****" && \ mkdir -p /app/www && \ - if [ -z ${HOMETOWN_VERSION+x} ]; then \ - HOMETOWN_VERSION=$(curl -sX GET "https://api.github.com/repos/hometown-fork/hometown/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ curl -s -o \ /tmp/mastodon.tar.gz -L \ - "https://github.com/hometown-fork/hometown/archive/refs/tags/${HOMETOWN_VERSION}.tar.gz" && \ + "https://codeberg.org/nikurasu/mastodon/archive/main.tar.gz" && \ tar xf \ /tmp/mastodon.tar.gz -C \ /app/www/ --strip-components=1 && \