diff --git a/.woodpecker.yml b/.woodpecker.yml index 466f46a..09a94bd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -92,12 +92,6 @@ pipeline: image: albedo.lan:5000/upend-deploy:latest pull: true commands: - - mkdir .ci_tmp && cd ./.ci_tmp - - wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage - - chmod +x linuxdeploy-x86_64.AppImage - - ./linuxdeploy-x86_64.AppImage --appimage-extract - - ln -s $PWD/squashfs-root/AppRun /usr/local/bin/linuxdeploy-x86_64.AppImage - - cd - - git status -vvv - task package diff --git a/build/upend-deploy/Dockerfile b/build/upend-deploy/Dockerfile index 5c6cb87..ce88ca1 100644 --- a/build/upend-deploy/Dockerfile +++ b/build/upend-deploy/Dockerfile @@ -1,2 +1,9 @@ -FROM alpine:latest -RUN apk add --no-cache gnupg openssh-client +FROM debian +RUN apt-get update && apt-get -y install gnupg openssh-client wget curl && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* +RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin +RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && \ + chmod +x linuxdeploy-x86_64.AppImage && \ + ./linuxdeploy-x86_64.AppImage --appimage-extract && \ + ln -s $PWD/squashfs-root/AppRun /usr/local/bin/linuxdeploy-x86_64.AppImage