From 10fb45a2a0874abf87d27450805b717924dbabe2 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 11 Feb 2024 15:31:28 -0500
Subject: [PATCH] Added link to laszlo.cloud post, as it's been a very useful
 resource; Testing pipeline changes

---
 .drone.yml | 16 +++++++++-------
 README.md  |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index bc5824e..779e040 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ trigger:
 
 services:
 - name: docker
-  image: docker.io/library/docker:25.0.2-dind-alpine3.19
+  image: docker.io/library/docker:25.0.3-git
   privileged: true
   volumes:
   - name: dockersock
@@ -37,26 +37,27 @@ steps:
     path: /scratch
 
 - name: build
-  image: docker.io/library/docker:25.0.2-dind-alpine3.19
+  image: docker.io/library/docker:25.0.3-git
   commands:
   - sleep 10 # give docker enough time to initialize
-  - docker image build -t image:latest .
+  - docker image build --cache-from git.williammiceli.systems/william/docker_satisfactory-server:latest --tag image:latest .
   volumes:
   - name: dockersock
     path: /var/run
 
 - name: push-gitea
-  image: docker.io/library/docker:25.0.2-dind-alpine3.19
+  image: docker.io/library/docker:25.0.3-git
   commands:
   - source /scratch/EXTRA_ENVIRONMENT
   - echo $GITEA_TOKEN | docker login git.williammiceli.systems --username $GITEA_USERNAME --password-stdin
   - docker image tag image:latest git.williammiceli.systems/william/docker_satisfactory-server:latest
-  - docker image tag image:latest git.williammiceli.systems/william/docker_satisfactory-server:app_build_id${APP_BUILD_ID}
+  - docker image tag image:latest git.williammiceli.systems/william/docker_satisfactory-server:app_build_id$${APP_BUILD_ID}
   - docker image tag image:latest git.williammiceli.systems/william/docker_satisfactory-server:ci_build${DRONE_BUILD_NUMBER}
   - docker image tag image:latest git.williammiceli.systems/william/docker_satisfactory-server:commit_sha${DRONE_COMMIT_SHA:0:12}
   - docker image push --all-tags git.williammiceli.systems/william/docker_satisfactory-server
   depends_on:
     - build
+    - get-app-version
   environment:
     GITEA_USERNAME:
       from_secret: GITEA_USERNAME
@@ -69,17 +70,18 @@ steps:
     path: /scratch
 
 - name: push-dockerhub
-  image: docker.io/library/docker:25.0.2-dind-alpine3.19
+  image: docker.io/library/docker:25.0.3-git
   commands:
   - source /scratch/EXTRA_ENVIRONMENT
   - echo $DOCKER_TOKEN | docker login docker.io --username $DOCKER_USERNAME --password-stdin
   - docker image tag image:latest docker.io/williammiceli/satisfactory-server:latest
-  - docker image tag image:latest docker.io/williammiceli/satisfactory-server:app_build_id${APP_BUILD_ID}
+  - docker image tag image:latest docker.io/williammiceli/satisfactory-server:app_build_id$${APP_BUILD_ID}
   - docker image tag image:latest docker.io/williammiceli/satisfactory-server:ci_build${DRONE_BUILD_NUMBER}
   - docker image tag image:latest docker.io/williammiceli/satisfactory-server:commit_sha${DRONE_COMMIT_SHA:0:12}
   - docker image push --all-tags docker.io/williammiceli/satisfactory-server
   depends_on:
     - build
+    - get-app-version
   environment:
     DOCKER_USERNAME:
       from_secret: DOCKER_USERNAME
diff --git a/README.md b/README.md
index 22a20c7..dda2399 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,5 @@
 
 * https://openai.com/chatgpt
 * https://github.com/steamcmd/docker
-* https://developer.valvesoftware.com/wiki/SteamCMD#Ubuntu
\ No newline at end of file
+* https://developer.valvesoftware.com/wiki/SteamCMD#Ubuntu
+* https://laszlo.cloud/drone-environment-variables-three-tips
\ No newline at end of file