♻️ REFACTOR: #157 in progress

apolopena · Dec 16, 2021 · f9c12cb · f9c12cb
1 parent 73551e1
commit f9c12cb
Showing 1 changed file with 36 additions and 14 deletions.
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -2,12 +2,34 @@ FROM gitpod/workspace-mysql
 
 USER gitpod
 
+# Copy required files to /tmp
+COPY --chown=gitpod:gitpod .gp/bash/update-composer.sh \
+    starter.ini \
+    .gp/conf/xdebug/xdebug.ini \
+    .gp/conf/apache/apache2.conf \
+    .gp/conf/nginx/nginx.conf \
+    .gp/bash/.bash_aliases \
+    .gp/bash/update-composer.sh \
+    .gp/bash/utils.sh \
+    .gp/bash/scaffold-project.sh \
+    .gp/snippets/server-functions.sh \
+    .gp/snippets/browser-functions.sh \
+    .gp/bash/bin/hot-reload.sh \
+    /tmp/
+
+# Create log files and move required files to their proper locations
 RUN sudo touch /var/log/workspace-image.log \
     && sudo chmod 666 /var/log/workspace-image.log \
     && sudo touch /var/log/workspace-init.log \
     && sudo chmod 666 /var/log/workspace-init.log \
     && sudo touch /var/log/xdebug.log \
-    && sudo chmod 666 /var/log/xdebug.log
+    && sudo chmod 666 /var/log/xdebug.log \
+    && sudo mv /tmp/apache2.conf /etc/apache2/apache2.conf \
+    && sudo mv /tmp/nginx.conf /etc/nginx/nginx.conf \
+    && sudo mv /tmp/.bash_aliases /home/gitpod/.bash_aliases \
+    && sudo mv /tmp/server-functions ~/.bashrc.d/server-functions \
+    && sudo mv /tmp/browser-functions ~/.bashrc.d/browser-functions \
+    && sudo mv /tmp/hot-reload.sh /usr/local/bin/hot-reload
 
 #RUN echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections \
 #    && sudo apt-get update -q \
@@ -32,27 +54,27 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-sel
 #   && sudo cp /tmp/xdebug.ini /etc/php/7.4/mods-available/xdebug.ini \
 #   && sudo ln -s /etc/php/7.4/mods-available/xdebug.ini /etc/php/7.4/fpm/conf.d 
 
-COPY --chown=gitpod:gitpod .gp/bash/update-composer.sh /tmp
+##COPY --chown=gitpod:gitpod .gp/bash/update-composer.sh /tmp
 RUN sudo bash -c ". /tmp/update-composer.sh" && rm /tmp/update-composer.sh
 
 # gitpod trick to bypass the docker caching mechanism for all lines below this one
 # just increment the value each time you want to bypass the cache system
 ENV INVALIDATE_CACHE=185
 
-COPY --chown=gitpod:gitpod .gp/conf/apache/apache2.conf /etc/apache2/apache2.conf
-COPY --chown=gitpod:gitpod .gp/conf/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY --chown=gitpod:gitpod .gp/bash/.bash_aliases /home/gitpod
-COPY --chown=gitpod:gitpod .gp/bash/utils.sh /tmp
-COPY --chown=gitpod:gitpod starter.ini /tmp
-COPY --chown=gitpod:gitpod .gp/bash/scaffold-project.sh /tmp
+#COPY --chown=gitpod:gitpod .gp/conf/apache/apache2.conf /etc/apache2/apache2.conf
+#COPY --chown=gitpod:gitpod .gp/conf/nginx/nginx.conf /etc/nginx/nginx.conf
+#COPY --chown=gitpod:gitpod .gp/bash/.bash_aliases /home/gitpod
+#COPY --chown=gitpod:gitpod .gp/bash/utils.sh /tmp
+#COPY --chown=gitpod:gitpod starter.ini /tmp
+#COPY --chown=gitpod:gitpod .gp/bash/scaffold-project.sh /tmp
 RUN sudo bash -c ". /tmp/scaffold-project.sh" && rm /tmp/scaffold-project.sh
 
 # Aliases
-COPY --chown=gitpod:gitpod .gp/snippets/server-functions.sh /tmp
-COPY --chown=gitpod:gitpod .gp/snippets/browser-functions.sh /tmp
-RUN cp /tmp/server-functions.sh ~/.bashrc.d/server-functions \
-    && cp /tmp/browser-functions.sh ~/.bashrc.d/browser-functions
+#COPY --chown=gitpod:gitpod .gp/snippets/server-functions.sh /tmp
+#COPY --chown=gitpod:gitpod .gp/snippets/browser-functions.sh /tmp
+#RUN cp /tmp/server-functions.sh ~/.bashrc.d/server-functions \
+#    && cp /tmp/browser-functions.sh ~/.bashrc.d/browser-functions
 
 # Customs cli's and user scripts for /usr/local/bin
-COPY --chown=gitpod:gitpod .gp/bash/bin/hot-reload.sh /usr/local/bin
-RUN sudo mv /usr/local/bin/hot-reload.sh /usr/local/bin/hot-reload
+#COPY --chown=gitpod:gitpod .gp/bash/bin/hot-reload.sh /usr/local/bin
+#RUN sudo mv /usr/local/bin/hot-reload.sh /usr/local/bin/hot-reload