diff --git a/Dockerfile b/Dockerfile index a29c562..1f64cb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM centos/ruby-24-centos7 +FROM centos/ruby-25-centos7 ENV BUNDLER_VERSION="1.17.3" \ OPENRESTY_VERSION=1.11.2.1 \ @@ -10,7 +10,6 @@ ARG DB=mysql ENV PATH="./node_modules/.bin:$PATH:/usr/local/nginx/sbin/:/usr/local/luajit/bin/" \ DISPLAY=:99.0 \ SKIP_ASSETS="1" \ - RAILS_ENV=test \ TZ=:/etc/localtime \ LD_LIBRARY_PATH=/opt/oracle/instantclient_12_2/ \ ORACLE_HOME=/opt/oracle/instantclient_12_2/ \ @@ -30,6 +29,7 @@ RUN yum install -y git \ make \ sudo \ rh-nodejs8 \ + file \ && echo 'default ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers RUN echo --color > ~/.rspec \ @@ -109,5 +109,3 @@ VOLUME [ "/opt/system/tmp/cache/", \ USER default ENTRYPOINT ["container-entrypoint"] - -CMD ["script/jenkins.sh"] diff --git a/Makefile b/Makefile index ed26553..48d8516 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ build: Dockerfile test: # docker run --user root --rm $(IMAGE_NAME) sh -c 'echo $$HOME | grep ' # docker run --rm $(IMAGE_NAME) sh -c 'echo $$HOME | grep /ruby' - docker run --rm $(IMAGE_NAME) ruby -v | grep 2.4 + docker run --rm $(IMAGE_NAME) ruby -v | grep 2.5 docker run --rm $(IMAGE_NAME) node -v docker run --rm $(IMAGE_NAME) bundle -v docker run --rm $(IMAGE_NAME) sh -c 'sudo ls -al /root'