From 0abfaca967b0e7bae408ee41c841ce4f464c6b3c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 24 Apr 2021 09:33:42 +0200
Subject: [PATCH] Added test cicd job

---
 .drone.yml                | 6 ------
 .woodpecker.yml           | 5 +++++
 docker/Dockerfile.builder | 7 +------
 docker/Dockerfile.dev     | 4 ++++
 docker/Dockerfile.rel     | 6 +++++-
 5 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 .drone.yml
 create mode 100644 .woodpecker.yml

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 01d2202..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-pipeline:
-    first-test:
-        image: alpine
-        commands:
-            - echo "woodpecker is very cool"
-
diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..2703d03
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,5 @@
+pipeline:
+    test:
+        image: chewingbever/fej-builder:latest
+        commands:
+            - cargo test
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index b4152fa..d50e8e4 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,6 +1,6 @@
 # vim: filetype=dockerfile
 # Our entire toolchain runs in alpine
-FROM alpine:latest AS builder
+FROM alpine:3.13.5 AS builder
 
 ENV PATH "$PATH:/app/.cargo/bin"
 # Needed for proper compiling of openssl-dev
@@ -29,8 +29,3 @@ WORKDIR /app
 RUN { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
     rustup target add x86_64-unknown-linux-musl --toolchain nightly && \
     mkdir -p .cargo/registry target
-
-# Copy source code over to builder
-COPY --chown=builder:builder Cargo.toml Cargo.lock ./
-COPY --chown=builder:builder src/ ./src/
-COPY --chown=builder:builder migrations/ ./migrations/
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index bac8b44..7aa9d09 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -3,6 +3,10 @@ FROM chewingbever/fej-builder:latest
 
 ENV RUST_BACKTRACE 1
 
+# Copy source code over to builder
+COPY --chown=builder:builder Cargo.toml Cargo.lock ./
+COPY --chown=builder:builder src/ ./src/
+COPY --chown=builder:builder migrations/ ./migrations/
 COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
 COPY --chown=builder:builder ./Rocket.toml /app/Rocket.toml
 
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 4f4c54d..79bd7bb 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -1,6 +1,10 @@
 # vim: filetype=dockerfile
 FROM chewingbever/fej-builder:latest AS builder
 
+COPY --chown=builder:builder Cargo.toml Cargo.lock ./
+COPY --chown=builder:builder src/ ./src/
+COPY --chown=builder:builder migrations/ ./migrations/
+
 # And then finally, build the project
 # Thank the lords that this article exists
 # https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
@@ -19,7 +23,7 @@ RUN cargo install \
 
 
 # Now, we create the actual image
-FROM alpine:latest
+FROM alpine:3.12.5
 COPY ./docker/crontab /var/spool/cron/crontabs/fej
 
 # Install some dynamic libraries needed for everything to work