Skip to content
This repository was archived by the owner on May 12, 2018. It is now read-only.

Commit 80b4bdd

Browse files
committed
Use double comments for commenting text in optional dependencies section.
1 parent 7c4e405 commit 80b4bdd

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

Dockerfile

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,26 @@ WORKDIR /gitlab-ci-runner.git
5353
# When the image is started add the remote server key, set up the runner and run it
5454
CMD ssh-keyscan -H $GITLAB_SERVER_FQDN >> /root/.ssh/known_hosts && bundle exec ./bin/setup_and_run
5555

56-
# Optional dependencies
56+
## Optional dependencies
57+
##
58+
## Install packages commonly required to test Rails projects before the test run starts
59+
## If they are not here you have to add them to the test script in the project settings
60+
#RUN apt-get install -y libqtwebkit-dev # test with capybara
61+
#RUN apt-get install -y sqlite3 libsqlite3-dev # sqlite is the default datastore
62+
#RUN apt-get install -y libmysqlclient-dev # native extensions for the mysql2 gem
63+
#RUN apt-get install -q -y mysql-server # install MySQL with blank root password
64+
#RUN cd /root && wget http://download.redis.io/redis-stable.tar.gz && tar xvzf redis-stable.tar.gz && cd redis-stable && make
5765
#
58-
# Install packages commonly required to test Rails projects before the test run starts
59-
# If they are not here you have to add them to the test script in the project settings
60-
# RUN apt-get install -y libqtwebkit-dev # test with capybara
61-
# RUN apt-get install -y sqlite3 libsqlite3-dev # sqlite is the default datastore
62-
# RUN apt-get install -y libmysqlclient-dev # native extensions for the mysql2 gem
63-
# RUN apt-get install -q -y mysql-server # install MySQL with blank root password
64-
# RUN cd /root && wget http://download.redis.io/redis-stable.tar.gz && tar xvzf redis-stable.tar.gz && cd redis-stable && make
66+
## Install PostgreSQL, after install this should work: psql --host=127.0.0.1 roottestdb
67+
#RUN apt-get install -y postgresql
68+
#RUN cat /dev/null > /etc/postgresql/9.3/main/pg_hba.conf
69+
#RUN echo "# TYPE DATABASE USER ADDRESS METHOD" >> /etc/postgresql/9.3/main/pg_hba.conf
70+
#RUN echo "local all all trust" >> /etc/postgresql/9.3/main/pg_hba.conf
71+
#RUN echo "host all all 127.0.0.1/32 trust" >> /etc/postgresql/9.3/main/pg_hba.conf
72+
#RUN echo "host all all ::1/128 trust" >> /etc/postgresql/9.3/main/pg_hba.conf
73+
#RUN /etc/init.d/postgresql start && su postgres -c "psql -c \"create user root;\"" && su postgres -c "psql -c \"alter user root createdb;\"" && su postgres -c "psql -c \"create database roottestdb owner root;\""
6574
#
66-
# Install PostgreSQL, after install this should work: psql --host=127.0.0.1 roottestdb
67-
# RUN apt-get install -y postgresql
68-
# RUN cat /dev/null > /etc/postgresql/9.3/main/pg_hba.conf
69-
# RUN echo "# TYPE DATABASE USER ADDRESS METHOD" >> /etc/postgresql/9.3/main/pg_hba.conf
70-
# RUN echo "local all all trust" >> /etc/postgresql/9.3/main/pg_hba.conf
71-
# RUN echo "host all all 127.0.0.1/32 trust" >> /etc/postgresql/9.3/main/pg_hba.conf
72-
# RUN echo "host all all ::1/128 trust" >> /etc/postgresql/9.3/main/pg_hba.conf
73-
# RUN /etc/init.d/postgresql start && su postgres -c "psql -c \"create user root;\"" && su postgres -c "psql -c \"alter user root createdb;\"" && su postgres -c "psql -c \"create database roottestdb owner root;\""
75+
## When the image is started add the remote server key, set up the runner and run it
76+
#WORKDIR /gitlab-ci-runner.git
7477
#
75-
# When the image is started add the remote server key, set up the runner and run it
76-
# WORKDIR /gitlab-ci-runner.git
77-
#
78-
# CMD ssh-keyscan -H $GITLAB_SERVER_FQDN >> /root/.ssh/known_hosts && mysqld & /root/redis-stable/src/redis-server & /etc/init.d/postgresql start & bundle exec ./bin/setup_and_run
78+
#CMD ssh-keyscan -H $GITLAB_SERVER_FQDN >> /root/.ssh/known_hosts && mysqld & /root/redis-stable/src/redis-server & /etc/init.d/postgresql start & bundle exec ./bin/setup_and_run

0 commit comments

Comments
 (0)