From 4a7723a9a820f5d1be75f2dfd3dd8ca851440b78 Mon Sep 17 00:00:00 2001 From: Philippe Loctaux Date: Sun, 19 Mar 2023 23:55:52 +0100 Subject: [PATCH] ci: docker depends on test, put LABEL at bottom of dockerfile --- .woodpecker/docker.yml | 5 ++++- .woodpecker/rust.yml | 2 +- Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml index de3476a..42620ad 100644 --- a/.woodpecker/docker.yml +++ b/.woodpecker/docker.yml @@ -1,5 +1,5 @@ pipeline: - latest-master: + docker-latest: when: branch: master event: push @@ -11,3 +11,6 @@ pipeline: from_secret: DOCKER_PASSWORD repo: gitea.y.z.x4m3.rocks/${CI_REPO_OWNER}/ezidam tag: latest + +depends_on: + - test \ No newline at end of file diff --git a/.woodpecker/rust.yml b/.woodpecker/rust.yml index e329c2e..fbaee13 100644 --- a/.woodpecker/rust.yml +++ b/.woodpecker/rust.yml @@ -2,7 +2,7 @@ variables: - &rust_image 'rust:latest' pipeline: - build: + test: image: *rust_image commands: # setup diff --git a/Dockerfile b/Dockerfile index a7eedc0..502dfe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -LABEL maintainer="Philippe Loctaux " - FROM clux/muslrust:stable as chef USER root RUN cargo install cargo-chef @@ -28,3 +26,5 @@ ENV ROCKET_PORT=8000 ENV ROCKET_DATABASES='{ezidam={url="/database/ezidam.sqlite"}}' EXPOSE 8000 ENTRYPOINT ["/ezidam"] + +LABEL maintainer="Philippe Loctaux "