From e8801af5390730c05baf9ab8e94b3b8a985db134 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Tue, 30 Mar 2021 10:01:21 -0700
Subject: [PATCH 1/4] [Resolves #956] attempt to fix build

Attempt to fix build failure `error: can't find Rust compiler`.

The docs says try to update pip or install rust..
https://cryptography.io/en/latest/faq.html#installing-cryptography-fails-with-error-can-not-find-rust-compiler`

We do both in the docker container that's used for builds.
---
 .idea/inspectionProfiles/Project_Default.xml   | 6 ++++++
 .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++
 .idea/modules.xml                              | 8 ++++++++
 Dockerfile                                     | 7 +++++--
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/modules.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..03d9549
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3046aee
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/sceptre-circleci.iml" filepath="$PROJECT_DIR$/.idea/sceptre-circleci.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 2a2d38a..d4576bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,9 +19,12 @@ RUN apk add --update --no-cache \
     readline-dev \
     openssl-dev \
     sqlite-dev \
-    zlib-dev
+    zlib-dev \
+    rust \
+    cargo
 
-RUN pip3 install --no-cache-dir virtualenv \
+RUN pip3 install --no-cache-dir --upgrade pip \
+ && pip3 install --no-cache-dir virtualenv \
  && pip3 install --no-cache-dir tox \
  && addgroup -g 3434 circleci \
  && adduser -D -u 3434 -G circleci -s /bin/bash circleci

From d7f3b08f681227558f5324dbd2da6160901da247 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Tue, 30 Mar 2021 11:00:12 -0700
Subject: [PATCH 2/4] remove pycharm files

---
 .idea/inspectionProfiles/Project_Default.xml   | 6 ------
 .idea/inspectionProfiles/profiles_settings.xml | 6 ------
 .idea/modules.xml                              | 8 --------
 3 files changed, 20 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 3046aee..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/sceptre-circleci.iml" filepath="$PROJECT_DIR$/.idea/sceptre-circleci.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

From def4083cd0865eee670c54ec47a3078f39f42e93 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Tue, 30 Mar 2021 13:05:30 -0700
Subject: [PATCH 3/4] update to alpine 3.13

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d4576bd..a5736cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.13
 
 RUN apk add --update --no-cache \
     patch \
@@ -9,6 +9,7 @@ RUN apk add --update --no-cache \
     curl \
     bzip2-dev \
     bash \
+    py3-pip \
     python3 \
     python3-dev \
     libffi-dev \

From eebb78e0d0937dbec2a52d8e1894423fc46da2aa Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Tue, 30 Mar 2021 14:04:51 -0700
Subject: [PATCH 4/4] pip upgrade not needed

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a5736cf..5f6dc39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,7 @@ RUN apk add --update --no-cache \
     rust \
     cargo
 
-RUN pip3 install --no-cache-dir --upgrade pip \
- && pip3 install --no-cache-dir virtualenv \
+RUN pip3 install --no-cache-dir virtualenv \
  && pip3 install --no-cache-dir tox \
  && addgroup -g 3434 circleci \
  && adduser -D -u 3434 -G circleci -s /bin/bash circleci