WIP run localeMerger

WycliffeAssociates · Nov 14, 2023 · d912c06 · d912c06
1 parent 3187650
commit d912c06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .env
+*.swp
diff --git a/makefile b/makefile
@@ -2,7 +2,7 @@
 build:
 	export IMAGE_TAG="local" \
 	&& cd wacs-gitea \
-	&& docker build --no-cache -t wycliffeassociates/wacs:$${IMAGE_TAG} .
+	&& docker build -t wycliffeassociates/wacs:$${IMAGE_TAG} .
 
 .PHONY: run
 run: build
@@ -31,4 +31,4 @@ logs:
 reload-gitea: build
 	export IMAGE_TAG="local" \
 	&& docker compose stop gitea \
-	&& docker compose up gitea -d
+	&& docker compose up gitea -d
diff --git a/wacs-gitea/Dockerfile b/wacs-gitea/Dockerfile
@@ -14,6 +14,7 @@ COPY custom/options/locale /wa-locale
 # output files to /output-locale/*.ini
 RUN mkdir /output-locale
 RUN go build -o localeMerger
+RUN /merge-locale/localeMerger
 
 # RUN npm install -ci
 # RUN node localeMerge.js