use Dockerfile.in rather than Dockerfile

flaxandteal · Mar 14, 2022 · 918d0df · 918d0df
1 parent 0321b49
commit 918d0df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 88 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -24,5 +24,6 @@ build:
   stage: build
   image: docker
   script:
-  - docker  build -t $CONTAINER_IMAGE -t $IMAGE_LATEST_TAG -t $IMAGE_SHA_TAG .
+  - apk add make m4
+  - make build
   - docker image push --all-tags $CI_REGISTRY_IMAGE
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-SHELL=bash
-MAIN=build
+SHELL=sh
+MAIN=build-dev
 
 BUILD=build
 
@@ -14,11 +14,15 @@ wheels:
 
 .PHONY: build
 build: Dockerfile
-	docker-compose build
+	docker build -t ${CONTAINER_IMAGE} -t ${IMAGE_LATEST_TAG} -t ${IMAGE_SHA_TAG} .
+
+.PHONY: build-dev
+build-dev: Dockerfile
+	docker-compose build-dev
 
 Dockerfile:
 	m4 Dockerfile.in > Dockerfile
 
 .PHONY: run
-run: build
+run: build-dev
 	docker-compose up