lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-159: Changed the inception of the version tag (#574) 

* GRN2-159: Changed the inception of the version tag

* GRN2-159: Restored TRAVIS_BRANCH

* Relocated ARG aNV for version in Dockerfile
This commit is contained in:
Jesus Federico 2019-06-21 10:15:10 -04:00 committed by GitHub
parent f5c33e9306
commit a0a99b34c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -20,7 +20,7 @@ jobs:
- stage: build - stage: build
name: build docker image name: build docker image
script: bash scripts/image_build.sh $TRAVIS_REPO_SLUG script: bash scripts/image_build.sh $TRAVIS_REPO_SLUG $TRAVIS_BRANCH
if: env(CD_BUILD_IGNORE) IS NOT present AND type NOT IN (pull_request) AND env(CD_DOCKER_USERNAME) IS present AND env(CD_DOCKER_PASSWORD) IS present if: env(CD_BUILD_IGNORE) IS NOT present AND type NOT IN (pull_request) AND env(CD_DOCKER_USERNAME) IS present AND env(CD_DOCKER_PASSWORD) IS present
notifications: notifications:

8
Dockerfile
View File

@ -6,13 +6,15 @@ RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
# Set an environment variable for the install location. # Set an environment variable for the install location.
ENV RAILS_ROOT /usr/src/app ENV RAILS_ROOT /usr/src/app
# Sets the footer of greenlight application with current build version
ARG version_code
ENV VERSION_CODE=$version_code
# Make the directory and set as working. # Make the directory and set as working.
RUN mkdir -p $RAILS_ROOT RUN mkdir -p $RAILS_ROOT
WORKDIR $RAILS_ROOT WORKDIR $RAILS_ROOT
# Set environment variables. # Set Rails environment.
ARG version_code
ENV VERSION_CODE=$version_code
ENV RAILS_ENV production ENV RAILS_ENV production
# Adding project files. # Adding project files.