From 2d0b32b01a575af06fb7107263d2bca6bc4072a0 Mon Sep 17 00:00:00 2001
From: jem <michael.jerger@meissa-gmbh.de>
Date: Fri, 12 Mar 2021 15:43:44 +0100
Subject: [PATCH] update to new versions & rename docker-image

---
 infrastructure/{docker => devops-build}/build.py | 4 ++--
 infrastructure/devops-build/image/Dockerfile     | 6 ++++++
 infrastructure/docker/image/Dockerfile           | 5 -----
 infrastructure/shadow-cljs/build.py              | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename infrastructure/{docker => devops-build}/build.py (95%)
 create mode 100644 infrastructure/devops-build/image/Dockerfile
 delete mode 100644 infrastructure/docker/image/Dockerfile

diff --git a/infrastructure/docker/build.py b/infrastructure/devops-build/build.py
similarity index 95%
rename from infrastructure/docker/build.py
rename to infrastructure/devops-build/build.py
index 75d82d3..31a4734 100644
--- a/infrastructure/docker/build.py
+++ b/infrastructure/devops-build/build.py
@@ -4,8 +4,8 @@ from pybuilder.core import task, init
 from ddadevops import *
 import logging
 
-name = 'dda-devops-build'
-MODULE = 'docker'
+name = 'devops-build'
+MODULE = 'devops-build'
 PROJECT_ROOT_PATH = '../..'
 
 
diff --git a/infrastructure/devops-build/image/Dockerfile b/infrastructure/devops-build/image/Dockerfile
new file mode 100644
index 0000000..0b20733
--- /dev/null
+++ b/infrastructure/devops-build/image/Dockerfile
@@ -0,0 +1,6 @@
+FROM docker:latest
+
+RUN set -eux; 
+RUN apk add --no-cache build-base rust python3 python3-dev py3-pip py3-setuptools py3-wheel libffi-dev openssl-dev cargo;
+RUN python3 -m pip install -U pip;
+RUN pip3 install pybuilder ddadevops deprecation python-terraform boto3 mfa;
\ No newline at end of file
diff --git a/infrastructure/docker/image/Dockerfile b/infrastructure/docker/image/Dockerfile
deleted file mode 100644
index 8fa7146..0000000
--- a/infrastructure/docker/image/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM docker:19.03.12
-
-RUN set -eux; 
-RUN apk add --no-cache build-base python3 python3-dev py3-pip py3-setuptools py3-wheel libffi-dev openssl-dev;
-RUN pip3 install pybuilder ddadevops deprecation python-terraform boto3 mfa
\ No newline at end of file
diff --git a/infrastructure/shadow-cljs/build.py b/infrastructure/shadow-cljs/build.py
index 129fdfe..6d4509b 100644
--- a/infrastructure/shadow-cljs/build.py
+++ b/infrastructure/shadow-cljs/build.py
@@ -5,7 +5,7 @@ from ddadevops import *
 import logging
 
 name = 'shadow-cljs'
-MODULE = 'docker'
+MODULE = 'shadow-cljs'
 PROJECT_ROOT_PATH = '../..'