From 2c80e90469d22080d84dc033c1ee0415ebbc4417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Bie=C5=84kowski?= <me@piotr.codes>
Date: Thu, 28 Jul 2022 15:05:07 +0200
Subject: [PATCH] Simplify the build process
---
docker-compose.yml | 7 +++++++
docker/scripts/run-docker | 4 +---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 230e7f3..aab7248 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,8 +19,12 @@ services:
- ./.datastore/postgresql:/var/lib/postgresql/data
backend:
+ platform: linux/amd64
container_name: shellvalier-backend
image: shellvalier-developer:latest
+ build:
+ context: .
+ dockerfile: Dockerfile
depends_on:
- postgresql
networks:
@@ -34,6 +38,9 @@ services:
frontend:
container_name: shellvalier-frontend
image: shellvalier-frontend-developer:latest
+ build:
+ context: .
+ dockerfile: Dockerfile-frontend
networks:
- app-tier
volumes:
diff --git a/docker/scripts/run-docker b/docker/scripts/run-docker
index a9b6f52..d1c8cb1 100755
--- a/docker/scripts/run-docker
+++ b/docker/scripts/run-docker
@@ -1,5 +1,3 @@
#!/usr/bin/env bash
set -e
-docker build -t shellvalier-developer -f Dockerfile .
-docker build -t shellvalier-frontend-developer -f Dockerfile-frontend .
-docker-compose up
+docker-compose up --build
--
GitLab