feat(install): use mutable docker tags for installer

Author: ginkoid

.github/workflows/ci.yml

@@ -115,10 +115,6 @@ jobs:
         password: ${{ secrets.DOCKERHUB_PASS }}
         repository: redpwn/rctf
         # TODO: handle tagging releases correctly
-        tags: ${{ github.sha }}
+        tags: master
+        tag_with_sha: true
         # TODO: add cache_froms once we have full releases
-    - name: Deploy installer
-      uses: netlify/actions/build@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_INSTALL_SITE_ID }}

.gitignore

@@ -10,7 +10,6 @@ yarn-error.log*
 /conf.d/*
 !/conf.d/.keep
 /docs/site
-/install/build
 
 # Upload provider dir
 /uploads

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2.2'
 services:
   rctf:
-    image: redpwn/rctf:${RCTF_GIT_COMMIT}
+    image: redpwn/rctf:${RCTF_GIT_REF}
     restart: always
     ports:
       - '127.0.0.1:8080:80'
@@ -11,11 +11,6 @@ services:
       - .env
     environment:
       - PORT=80
-      - RCTF_DATABASE_HOST=postgres
-      - RCTF_DATABASE_DATABASE=rctf
-      - RCTF_DATABASE_USERNAME=rctf
-      - RCTF_REDIS_HOST=redis
-      - RCTF_DATABASE_MIGRATE=before
     volumes:
       - ./conf.d:/app/conf.d
     depends_on:

install/_redirects

@@ -67,14 +67,14 @@ do_install() {
 
   info "Configuring rCTF..."
 
-  RCTF_GIT_COMMIT="${RCTF_GIT_COMMIT:-"{{git_commit}}"}"
+  RCTF_GIT_REF="${RCTF_GIT_REF:-"master"}"
 
   mkdir -p conf.d data/rctf-postgres data/rctf-redis
 
   printf "%s\n" \
   "RCTF_DATABASE_PASSWORD=$(get_key)" \
   "RCTF_REDIS_PASSWORD=$(get_key)" \
-  "RCTF_GIT_COMMIT=$RCTF_GIT_COMMIT" \
+  "RCTF_GIT_REF=$RCTF_GIT_REF" \
   > .env
 
   printf "%s\n" \
@@ -94,9 +94,20 @@ do_install() {
   "endTime: $(date -d +1week +%s)000" \
   > conf.d/02-ctf.yaml
 
+  printf "%s\n" \
+  "database:" \
+  "  sql:" \
+  "    host: postgres" \
+  "    user: rctf" \
+  "    database: rctf" \
+  "  redis:" \
+  "    host: redis" \
+  "  migrate: before" \
+  > conf.d/03-db.yaml
+
   info "Downloading rCTF..."
 
-  curl -fsSO "https://raw.githubusercontent.com/redpwn/rctf/$RCTF_GIT_COMMIT/docker-compose.yml"
+  curl -fsSO "https://raw.githubusercontent.com/redpwn/rctf/$RCTF_GIT_REF/docker-compose.yml"
   docker-compose pull
 
   info "Finished installation to ${RCTF_INSTALL_PATH}."