#7: Clean up

riotkit-org · Nov 15, 2020 · d4475e6 · d4475e6
1 parent c5b74d7
commit d4475e6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 37 deletions.
diff --git a/.infrastructure/arm.Dockerfile b/.infrastructure/arm.Dockerfile
@@ -22,11 +22,6 @@ RUN cd /infracheck \
     && pip3 install pbr==5.4.5 \
     && pip3 install -r /infracheck/requirements.txt \
     && rkd :install \
-    # after installing as package extract infrastructural files
-    \
-    && cp -pr /infracheck/entrypoint.sh / \
-    && cp -pr /infracheck/supervisord.conf /etc/supervisord.conf \
-    && chmod +x /entrypoint.sh \
     \
     # delete the temporary directory after the application was installed via setuptools
     && rm -rf /infracheck \
@@ -37,4 +32,11 @@ RUN cd /infracheck \
     && apk del BUILD_DEPS
 RUN [ "cross-build-end" ]
 
+ADD /.infrastructure/entrypoint.sh /entrypoint.sh
+ADD /.infrastructure/supervisord.conf /etc/supervisord.conf
+
+RUN [ "cross-build-start" ]
+RUN chmod +x /entrypoint.sh
+RUN [ "cross-build-end" ]
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/entrypoint.sh → .infrastructure/entrypoint.sh b/entrypoint.sh → .infrastructure/entrypoint.sh
diff --git a/.infrastructure/generate-requirements-txt.py b/.infrastructure/generate-requirements-txt.py
diff --git a/.infrastructure/notify.sh b/.infrastructure/notify.sh
diff --git a/supervisord.conf → .infrastructure/supervisord.conf b/supervisord.conf → .infrastructure/supervisord.conf
diff --git a/.infrastructure/x86_64.Dockerfile b/.infrastructure/x86_64.Dockerfile
@@ -19,11 +19,6 @@ RUN cd /infracheck \
     && pip3 install pbr==5.4.5 \
     && pip3 install -r /infracheck/requirements.txt \
     && rkd :install \
-    # after installing as package extract infrastructural files
-    \
-    && cp -pr /infracheck/entrypoint.sh / \
-    && cp -pr /infracheck/supervisord.conf /etc/supervisord.conf \
-    && chmod +x /entrypoint.sh \
     \
     # delete the temporary directory after the application was installed via setuptools
     && rm -rf /infracheck \
@@ -33,4 +28,8 @@ RUN cd /infracheck \
     \
     && apk del BUILD_DEPS
 
+ADD /.infrastructure/entrypoint.sh /entrypoint.sh
+ADD /.infrastructure/supervisord.conf /etc/supervisord.conf
+RUN chmod +x /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]