fix volume causing oci runtime error

Dockerfile

@@ -3,17 +3,23 @@ LABEL maintainer "Christopher Burroughs <chris.burroughs@protonmail.ch>, ynnk"
 
 # Setup application home
 ENV APP_HOME /var/padagraph/botapadd
-RUN mkdir -p /var/padagraph/botapadd/log
-WORKDIR /var/padagraph/botapadd
+RUN mkdir -p $APP_HOME $APP_HOME/log $APP_HOME/static $APP_HOME/static/images
+WORKDIR $APP_HOME
 ENV PYTHONPATH=/var/padagraph/botapadd/screenshot/:/usr/lib/python2.7/dist-packages/
 
-COPY . /var/padagraph/botapadd/
-#COPY ./static/ /var/padagraph/botapadd/static
+COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
+# Copy those after pip install to avoid rebuilding layers
+COPY botapad.py botapadapp.py ./
+#COPY static/ static/
+ADD https://github.com/Semantic-Org/Semantic-UI-CSS/archive/master.zip static/
+COPY templates/ templates/
+
 # Temp: volumize whole app dir. Should only volumize /log/
 VOLUME /var/padagraph/botapadd
 EXPOSE 5000 80
 
+COPY docker-entry.sh /var/padagraph/botapadd/docker-entry.sh
 ENTRYPOINT ["/var/padagraph/botapadd/docker-entry.sh"]
 CMD ["/bin/bash"]
\ No newline at end of file

Makefile

@@ -14,11 +14,10 @@ docker-build:
 	@echo "\n --------------------"
 	@echo " * Building Docker images"
 	@echo " --------------------\n"
-	mkdir -p  ./static/images/
-	wget https://github.com/Semantic-Org/Semantic-UI-CSS/archive/master.zip -O static/master.zip
-	cd ./static && unzip -o master.zip
-	docker-compose -f docker-compose.yml build --pull --no-cache
-
+	# mkdir -p  ./static/images/
+	# wget https://github.com/Semantic-Org/Semantic-UI-CSS/archive/master.zip -O static/master.zip
+	# cd ./static && unzip -o master.zip
+	docker-compose -f docker-compose.yml build
 
 docker-push:
 	@echo "\n --------------------"

deploy-dev.sh

@@ -5,5 +5,5 @@
 
 PROJECT="botapadd-dev"
 
-docker-compose -p $PROJECT up --build --force-recreate -d
-docker-compose -p $PROJECT logs -ft
+docker-compose up --build --force-recreate -d
+docker-compose logs -ft
\ No newline at end of file

deploy-prod.sh

@@ -5,6 +5,6 @@
 
 PROJECT="botapadd-prod"
 
-docker-compose -f docker-compose.yml pull
-docker-compose -p $PROJECT -f docker-compose.yml up --no-build -d
-docker-compose -p $PROJECT logs -ft
+#docker-compose -f docker-compose.yml pull
+docker-compose -f docker-compose.yml up --force-recreate -d
+docker-compose logs -ft
\ No newline at end of file

docker-compose.yml

@@ -2,15 +2,15 @@ version: "2"
 services:
   botapadd:
     # TODO: a port should be defined, but not "80" if on production server
-    ports:
-      - "81:80"
     image: 193.70.90.12:5000/padagraph/botapadd:latest
     build: .
+    ports:
+      - "81:80"
     restart: unless-stopped
-    env_file: environment.sh
+    env_file: environment.env
     volumes:
       - ./log:/var/padagraph/botapadd/log
-      - ./secret:/var/padagraph/botapadd/
+      - ./secret/key.txt:/var/padagraph/botapadd/key.txt
       # - ./src:src # do that in dev with gunicorn as well? (only in dev right now)
 # volumes:
 #   botapadd-data: