dockerfiles

Author: DevAlone

Dockerfile

@@ -7,8 +7,7 @@ RUN apt update && apt install -y wget > /dev/null && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /proxy_py
 USER user
-# TODO: change to master
-ARG VERSION=73850a02909242bcc68f3257a8663ca113128704
+ARG VERSION=master
 
 RUN wget https://github.com/DevAlone/proxy_py/archive/$VERSION.tar.gz -O sources.tar.gz 2> /dev/null \
 	&& tar -xf sources.tar.gz && rm sources.tar.gz \

build_docker.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+if [ $# -eq 0 ]
+then
+	tag='latest'
+	git checkout master || exit 1
+else
+	tag=$1
+	git checkout $tag || exit 1
+fi
+
+docker build -t DevAlone/proxy_py:$tag .
+docker push DevAlone/proxy_py:$tag

docker-compose.yml

@@ -9,16 +9,16 @@ services:
             - POSTGRES_PASSWORD=proxy_py
             - POSTGRES_DB=proxy_py
         volumes:
-            - pgdata:/home/user/proxy_py_postgres_data
+            - db_data:/var/lib/postgresql/data
     core:
         build: .
         ports:
             - "55555:55555"
         environment:
-            - PROXY_PY_PROXY_PROVIDER_SERVER_ADDRESS="{'HOST':'0.0.0.0','PORT':55555}"
-            - PROXY_PY_DATABASE_CONNECTION_KWARGS="{'host':'db','database':'proxy_py','user':'proxy_py','password':'proxy_py'}"
+            - PROXY_PY_PROXY_PROVIDER_SERVER_ADDRESS={'HOST':'0.0.0.0','PORT':55555}
+            - PROXY_PY_DATABASE_CONNECTION_KWARGS={'host':'db','database':'proxy_py','user':'proxy_py','password':'proxy_py'}
         depends_on:
             - db
 
 volumes: 
-    pgdata:
+    db_data: