From 468ca11d8cfdf03f0bb1737611adaf1ddf18a1a9 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Sat, 21 Mar 2020 00:49:16 -0400
Subject: [PATCH] docker

---
 .gitlab-ci.yml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 409c785..0237d1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ubuntu:18.04
+image: docker:latest 
 
 services:
   - docker:dind
@@ -7,35 +7,17 @@ variables:
   GIT_SUBMODULE_STRATEGY: "recursive"
   MISTBORN_DEFAULT_PASSWORD: "default_password"
   
-before_script:
-  #- apk add docker-compose
-  - apt-get update
-  - apt-get install -y sudo
-  - scripts/subinstallers/docker.sh
-  - scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
-  - cp compose/production/traefik/traefik.toml.template compose/production/traefik/traefik.toml 
-
 stages:
   - test
 
 #include:
 #  - template: Code-Quality.gitlab-ci.yml
 
-#install:
-#  stage: test
-#  image: ubuntu:18.04
-#  variables:
-#    MISTBORN_TEST_SKIP_IPTABLES: "true"
-#  before_script:
-#    - apt-get update
-#    - apt-get install -y sudo git
-#  script:
-#    - echo "MISTBORN_TEST_SKIP_IPTABLES:"
-#    - echo $MISTBORN_TEST_SKIP_IPTABLES
-#    - scripts/install.sh
-
 docker_build:
   stage: test
   script:
+    - apk add docker-compose
+    - scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
+    - cp compose/production/traefik/traefik.toml.template compose/production/traefik/traefik.toml 
     - docker-compose -f base.yml build