From 39d7113234dd85a2df1c765677c74f7256dde38d Mon Sep 17 00:00:00 2001 From: Patrick Cleavelin Date: Sat, 29 Jul 2023 14:30:52 -0500 Subject: [PATCH] no docker, only nix --- .woodpecker.yml | 38 +++++++++++++++----------------------- Dockerfile | 36 ------------------------------------ rust-toolchain | 2 +- 3 files changed, 16 insertions(+), 60 deletions(-) delete mode 100644 Dockerfile diff --git a/.woodpecker.yml b/.woodpecker.yml index 5b3aa3d..61b2b18 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,29 +5,21 @@ steps: # - apk add --no-cache git nix --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing # - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#default - # build-docker-image: - # image: alpine:edge - # commands: - # - apk add --no-cache git nix --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing - # - echo "system-features = nixos-test benchmark big-parallel uid-range kvm" > /etc/nix/nix.conf - # - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#docker - build-docker-image: - image: docker + image: alpine:edge commands: - - docker buildx build . - volumes: - - /var/run/docker.sock:/var/run/docker.sock + - apk add --no-cache git nix --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing + - echo "system-features = nixos-test benchmark big-parallel uid-range kvm" > /etc/nix/nix.conf + - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#docker - # publish-image: - # when: - # event: [tag, deployment] - # environment: prod - # image: git.spacegirl.nl/patrick/plugin-artifact - # settings: - # tag: $CI_COMMIT_TAG - # user: patrick - # password: - # from_secret: forgejo_token - # repo: $CI_REPO - # image_tar: result + publish-image: + when: + event: tag + image: git.spacegirl.nl/patrick/plugin-artifact + settings: + tag: $CI_COMMIT_TAG + user: patrick + password: + from_secret: forgejo_token + repo: $CI_REPO + image_tar: result diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 5354089..0000000 --- a/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM rust:1.71.0-slim AS builder - -RUN USER=root cargo new --bin memejoin-docker - -RUN apt update \ - && apt install -y ca-certificates git cmake gcc libopus-dev libssl-dev pkg-config \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR ./memejoin-docker -COPY ./Cargo.toml ./Cargo.toml -RUN cargo build --release -RUN rm src/*.rs - -ADD . ./ - -RUN rm ./target/release/deps/memejoin-docker -RUN cargo build --release - -FROM debian:bookworm -ARG APP=/usr/src/app - -RUN apt update \ - && apt install -y ca-certificates yt-dlp ffmpeg libopus0 openssl pkg-config \ - && rm -rf /var/lib/apt/lists/* - -EXPOSE 8100 - -RUN groupadd $APP_USER && useradd -g $APP_USER $APP_USER && mkdir -p ${APP} -COPY --from=builder /memejoin-docker/target/release/memejoin-docker ${APP}/memejoin-docker - -RUN chown -R $APP_USER:$APP_USER ${APP} - -USER $APP_USER -WORKDIR ${APP} - -CMD ["./memejoin-docker"] diff --git a/rust-toolchain b/rust-toolchain index 6f39b03..bf867e0 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-07-27 +nightly