diff options
Diffstat (limited to 'ransim/docker/ransim-docker')
-rw-r--r-- | ransim/docker/ransim-docker/Dockerfile | 35 | ||||
-rwxr-xr-x[-rw-r--r--] | ransim/docker/ransim-docker/do-start.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ransim/docker/ransim-docker/docker-install.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ransim/docker/ransim-docker/wait-for-port.sh | 0 |
4 files changed, 19 insertions, 16 deletions
diff --git a/ransim/docker/ransim-docker/Dockerfile b/ransim/docker/ransim-docker/Dockerfile index a576c92..b139fef 100644 --- a/ransim/docker/ransim-docker/Dockerfile +++ b/ransim/docker/ransim-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:18.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -7,26 +7,27 @@ ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY RUN \ - apt-get clean && \ - apt-get update && \ - apt-get install -y zip unzip curl wget ssh telnet maven && \ - apt-get install -y software-properties-common && \ - apt-get install -y jq httpie && \ - apt-get install -y python-pip && \ - add-apt-repository ppa:openjdk-r/ppa && \ - apt-get clean && \ - apt-get update && \ - apt-get install -y openjdk-8-jdk +apt-get clean && \ +apt-get update && \ +apt-get install -y zip unzip curl wget ssh telnet maven && \ +apt-get install -y software-properties-common && \ +apt-get install -y jq httpie && \ +apt-get install -y python-pip && \ +apt-get install -y vim && \ +add-apt-repository ppa:openjdk-r/ppa && \ +apt-get clean && \ +apt-get update && \ +apt-get install -y openjdk-8-jdk RUN useradd --create-home --shell /bin/bash policy RUN \ apt-get install -y apt-transport-https && \ - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \ - add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu trusty main' && \ - apt-get clean && \ - apt-get update && \ - apt-get install -y mariadb-client +apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \ +add-apt-repository 'deb [arch=amd64,arm64,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.4/ubuntu bionic main' && \ +apt-get clean && \ +apt-get update && \ +apt-get install -y mariadb-client RUN mkdir -p /opt/app/policy /tmp/ransim-install && chown policy /opt/app/policy /tmp/ransim-install @@ -39,3 +40,5 @@ USER policy ENTRYPOINT [ "bash", "./do-start.sh" ] + + diff --git a/ransim/docker/ransim-docker/do-start.sh b/ransim/docker/ransim-docker/do-start.sh index ec1f601..ec1f601 100644..100755 --- a/ransim/docker/ransim-docker/do-start.sh +++ b/ransim/docker/ransim-docker/do-start.sh diff --git a/ransim/docker/ransim-docker/docker-install.sh b/ransim/docker/ransim-docker/docker-install.sh index cbfe0b1..cbfe0b1 100644..100755 --- a/ransim/docker/ransim-docker/docker-install.sh +++ b/ransim/docker/ransim-docker/docker-install.sh diff --git a/ransim/docker/ransim-docker/wait-for-port.sh b/ransim/docker/ransim-docker/wait-for-port.sh index 10f08de..10f08de 100644..100755 --- a/ransim/docker/ransim-docker/wait-for-port.sh +++ b/ransim/docker/ransim-docker/wait-for-port.sh |