RUBY-2045 (#102)

* init

* Uncommented push images script

* Changed contrast config file extension

* Restoring defaults

* Updating docker agentt base.

* Updating Agent dockerfile

* Updated base agent docker config copy

* Testing config files delivery

* Removed dummy yaml config

* Updated passenger config path

* Testing passenger config paths

* Updated passenger docker files

* Restoring passenger dockerfiles

* Added Config path env back

* Updated Passenger docker files

* Moving Configuration files for passenger

Author: Teodor-Raychev

docker/Dockerfile_agent

@@ -6,6 +6,7 @@ ENV CI_TEST=true
 COPY agent/* agent/
 RUN rm contrast_security.yaml || true
 COPY contrast_security.yaml contrast_security.yaml
+COPY config/contrast_security.yml config/contrast_security.yml
 RUN gem install ./agent/contrast-agent.gem
 
 CMD tail -f /tmp/tail_me

docker/Dockerfile_passenger_max

@@ -10,6 +10,10 @@ RUN bundle config set with 'passenger_max'
 
 RUN bundle update
 
+# Copy configuration files to root directory:
+RUN cp /app/contrast_security.yaml /app/spec/dummy/contrast_security.yaml
+RUN cp /app/config/contrast_security.yml /app/spec/dummy/config/contrast_security.yml
+
 # So we may use whatever command we want to trigger rake, to be sure
 # that the agent is not braking the rake task
 
@@ -18,4 +22,4 @@ RUN bundle exec rake db:version
 
 # Name and run the application
 RUN ./docker/app_name_generator.sh Passenger_max >> /tmp/app_name.txt
-CMD redis-server & cat /tmp/app_name.txt && CONTRAST_CONFIG_PATH=/app/contrast_security.yaml CONTRAST__APPLICATION__NAME=$(cat /tmp/app_name.txt) PASSENGER_START_TIMEOUT=300 bundle exec rails s -p $PORT
+CMD redis-server & cat /tmp/app_name.txt && CONTRAST__APPLICATION__NAME=$(cat /tmp/app_name.txt) PASSENGER_START_TIMEOUT=300 bundle exec rails s -p $PORT

docker/Dockerfile_passenger_min

@@ -10,6 +10,10 @@ RUN bundle config set with 'passenger_min'
 
 RUN bundle update
 
+# Copy configuration files to root directory:
+RUN cp /app/contrast_security.yaml /app/spec/dummy/contrast_security.yaml
+RUN cp /app/config/contrast_security.yml /app/spec/dummy/config/contrast_security.yml
+
 # So we may use whatever command we want to trigger rake, to be sure
 # that the agent is not braking the rake task
 
@@ -18,4 +22,4 @@ RUN bundle exec rake db:version
 
 # Name and run the application
 RUN ./docker/app_name_generator.sh Passenger_min >> /tmp/app_name.txt
-CMD redis-server & cat /tmp/app_name.txt && CONTRAST_CONFIG_PATH=/app/contrast_security.yaml CONTRAST__APPLICATION__NAME=$(cat /tmp/app_name.txt) PASSENGER_START_TIMEOUT=300 bundle exec rails s -p $PORT
+CMD redis-server & cat /tmp/app_name.txt && CONTRAST__APPLICATION__NAME=$(cat /tmp/app_name.txt) PASSENGER_START_TIMEOUT=300 bundle exec rails s -p $PORT

scripts/push_github_images.sh

@@ -19,7 +19,7 @@ if [ $PAT_VALID == true ] && [ $GH_USERNAME_VALID == true ]; then
   echo
 
   # Build images from config:
-  # build_docker_images
+   build_docker_images
 
   # Push the images
   # Comment this out for local debug and troubleshooting, first test run.