Skip to content

Commit

Permalink
docker image build: add translations
Browse files Browse the repository at this point in the history
  • Loading branch information
tuxpiper committed Apr 9, 2018
1 parent 99d8e10 commit 504f848
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ server/www/locales/
*.aes
*.swp
*.swo
buildargs.env
deployment.env
vault.txt
*.swo
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ COPY package.json .
RUN npm-install-silent.sh

COPY . ./
RUN gulp build
ARG TX_USERNAME
ARG TX_PASSWORD
RUN TX_USERNAME="${TX_USERNAME}" TX_PASSWORD="${TX_PASSWORD}" gulp build


FROM nginx

Expand Down
1 change: 1 addition & 0 deletions buildargs.env.encrypted
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aUXiCjDBqCPhEAYhlXLXpC+lGUL9jevdDHq4jpNE497/BEwS2gQXdBtjIp3OHly/66Jcaloj1FSlpRizlpBDk4HHs8k=
2 changes: 1 addition & 1 deletion codeship-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ dockerimg:
build:
image: ushahidi-platform-client/dockerimg
dockerfile_path: Dockerfile
encrypted_args_file: buildargs.env.encrypted
cached: true
command: noop

release:
build:
Expand Down
6 changes: 0 additions & 6 deletions docker/nginx.run.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#!/bin/sh

if [ "$1" == "noop" ]; then
# do nothing operator
sleep infinity
exit 0;
fi

# patch in frontend configuration
if [ -z "$BACKEND_URL" ]; then
echo "ERROR! You must provide a BACKEND_URL variable pointing at an ushahidi API host"
Expand Down

0 comments on commit 504f848

Please sign in to comment.