diff --git a/Dockerfile b/Dockerfile index 5c4b09e..384dc3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -139,10 +139,5 @@ VOLUME [ "/opt/openqa" ] RUN mkdir -p /opt/testing_area RUN chown -R $NORMAL_USER:users /opt/testing_area -COPY entrypoint.sh /usr/bin/entrypoint -RUN ["chmod","+x","/usr/bin/entrypoint"] -USER ${NORMAL_USER} -ENTRYPOINT ["entrypoint"] +ENTRYPOINT ["/bin/bash"] WORKDIR $OPENQA_DIR - - diff --git a/_service b/_service index 1d0e924..9387dd5 100644 --- a/_service +++ b/_service @@ -1,7 +1,6 @@ - docker/travis_test/entrypoint.sh docker/travis_test/Dockerfile openQA.spec openQA-test.spec diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 59fd241..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -set -e - -cp -rd /opt/openqa /opt/testing_area - -cd /opt/testing_area/openqa - -function create_db { - set -e - export PGDATA=$(mktemp -d) - initdb --auth=trust -N $PGDATA - -cat >> $PGDATA/postgresql.conf <= 0.082801 BuildRequires: perl(Minion) >= 9.02 -BuildRequires: perl(Mojolicious) >= 7.24 +BuildRequires: perl(Mojolicious) >= 7.92 BuildRequires: perl(Mojolicious::Plugin::AssetPack) >= 1.36 BuildRequires: rubygem(sass) Requires: dbus-1 @@ -129,7 +128,7 @@ operating system. Summary: The openQA common tools for web-frontend and workers Group: Development/Tools/Other Requires: %{t_requires} -Requires: perl(Mojolicious) >= 7.24 +Requires: perl(Mojolicious) >= 7.92 %description common This package contain shared resources for openQA web-frontend and