From d122bf0e3b261381f2b92b787c191f3b88da21bd Mon Sep 17 00:00:00 2001
From: Christopher Vagnetoft <cvagnetoft@gmail.com>
Date: Fri, 3 Dec 2021 17:19:28 +0100
Subject: [PATCH] More tweaks

---
 .woodpecker.yml | 21 +++++++++------------
 Dockerfile      | 11 +++++------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index b247202..a06ceda 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,15 +1,12 @@
-kind: pipeline
-name: default
-steps:
-- name: phpunit
-  image: walkero/phpunit-alpine:php8.0-phpunit9
-  commands:
-    - composer install
-    - phpunit
-- name: dockerbuild
-  image: plugins/docker
-  settings:
+pipeline:
+  phpunit:
+    image: walkero/phpunit-alpine:php8.0-phpunit9
+    commands:
+      - composer install
+      - phpunit
+      - echo -n 'latest,1.0' > .tags
+  dockerbuild:
+    image: plugins/docker
     repo: docker.noccylabs.info/noccy/pipeline-test
     registry: docker.noccylabs.info
-    tags: [ latest, '1.0' ]
     
diff --git a/Dockerfile b/Dockerfile
index 8dc1324..9564a57 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
-FROM composer:latest
+FROM composer:latest as composer
+WORKDIR /application
+COPY . /application
+RUN composer install
 
 FROM php:8.0-cli-alpine
-
 WORKDIR /application
-
-COPY . /application
-COPY --from=0 /usr/bin/composer /usr/bin/composer
-RUN composer install
+COPY --from=composer /application /application
 
 ENTRYPOINT /application/hello