Update docker-compose to compose 3.7 with stack options, upgrade kube…

…ctl image, and job image to py37
Brunk4 · Nov 6, 2018 · 7104b97 · 7104b97
1 parent adc6505
commit 7104b97
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.7'
 
 services:
   db:
@@ -8,6 +8,14 @@ services:
       - "5432:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
+    deploy:
+      replicas: 1
+      endpoint_mode: dnsrr
+      resources:
+        limits:
+          memory: 1024M
+        reservations:
+          memory: 128M
 
   ipfs:
     image: ipfs/go-ipfs:release
@@ -20,6 +28,14 @@ services:
       - "4002:4002"
       - "5001:5001"
       - "8080:8080"
+    deploy:
+      replicas: 1
+      endpoint_mode: dnsrr
+      resources:
+        limits:
+          memory: 1024M
+        reservations:
+          memory: 128M
 
   web:
     restart: unless-stopped
@@ -29,6 +45,7 @@ services:
     env_file:
       - app/app/.env
     build: .
+    image: gitcoinco/web:latest
     volumes:
       - .:/code
     ports:
@@ -38,13 +55,28 @@ services:
       - db
     stdin_open: true
     tty: true
+    deploy:
+      replicas: 1
+      endpoint_mode: dnsrr
+      resources:
+        limits:
+          memory: 1024M
+        reservations:
+          memory: 512M
 
   testrpc:
     image: trufflesuite/ganache-cli
     ports:
       - "8545:8545"
-    # command: "-a 1 --seed 2"
-    command: '--host 0.0.0.0 --mnemonic "${TEST_MNEMONIC}"'
+    command: '-a 1 --seed 2 --host 0.0.0.0 --mnemonic "${TEST_MNEMONIC}"'
+    deploy:
+      replicas: 1
+      endpoint_mode: dnsrr
+      resources:
+        limits:
+          memory: 1024M
+        reservations:
+          memory: 128M
 
   redis:
     restart: unless-stopped
@@ -55,6 +87,14 @@ services:
       - redis:/data
     ports:
       - "6379:6379"
+    deploy:
+      replicas: 1
+      endpoint_mode: dnsrr
+      resources:
+        limits:
+          memory: 1024M
+        reservations:
+          memory: 128M
 
 volumes:
   pgdata:

diff --git a/ops/images/job/Dockerfile b/ops/images/job/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-alpine3.7
+FROM python:3.7-alpine
 # Specify label-schema specific arguments and labels.
 ARG BUILD_DATE
 ARG VCS_REF
@@ -17,7 +17,7 @@ ENV LANG en_US.utf8
 RUN apk add --no-cache --update bash dumb-init postgresql-client py3-magic && \
     pip install awscli s3cmd && \
     mkdir -p /jobs/backups
-WORKDIR "/jobs"
+WORKDIR /jobs
 COPY entry.sh /bin/entry.sh
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["/bin/entry.sh"]
diff --git a/ops/images/kubectl/Dockerfile b/ops/images/kubectl/Dockerfile
@@ -1,13 +1,13 @@
 # Build Image
-FROM alpine:3.6 as alpine
-ARG VERSION=v1.10.0
+FROM alpine:3.8 as alpine
+ARG VERSION=v1.12.2
 WORKDIR /
 RUN apk add -U --no-cache curl ca-certificates && \
     curl -L "https://storage.googleapis.com/kubernetes-release/release/$VERSION/bin/linux/amd64/kubectl" -o /usr/local/bin/kubectl && \
     chmod +x /usr/local/bin/kubectl
 # Release Image
 FROM scratch
-ARG VERSION=v1.10.0
+ARG VERSION=v1.12.2
 ARG VCS_REF
 ARG BUILD_DATE
 COPY --from=alpine /usr/local/bin/kubectl /bin/kubectl