diff --git a/artemis-docker/Dockerfile-ubuntu b/artemis-docker/Dockerfile-debian similarity index 94% rename from artemis-docker/Dockerfile-ubuntu rename to artemis-docker/Dockerfile-debian index 488e6e4a8e..d584080a3e 100644 --- a/artemis-docker/Dockerfile-ubuntu +++ b/artemis-docker/Dockerfile-debian @@ -31,8 +31,7 @@ ENV CREATE_ARGUMENTS --user ${ARTEMIS_USER} --password ${ARTEMIS_PASSWORD} --sil # add user and group for artemis RUN groupadd -g 1000 -r artemis && useradd -r -u 1000 -g artemis artemis \ && apt-get -qq -o=Dpkg::Use-Pty=0 update && \ - apt-get -qq -o=Dpkg::Use-Pty=0 install -y --no-install-recommends \ - libaio1=0.3.110-3 && \ + apt-get -qq -o=Dpkg::Use-Pty=0 install -y libaio1 && \ rm -rf /var/lib/apt/lists/* USER artemis @@ -67,4 +66,4 @@ VOLUME ["/var/lib/artemis-instance"] WORKDIR /var/lib/artemis-instance ENTRYPOINT ["/docker-run.sh"] -CMD ["run"] \ No newline at end of file +CMD ["run"] diff --git a/artemis-docker/prepare-docker.sh b/artemis-docker/prepare-docker.sh index e9d5eeea90..dd40becfc4 100755 --- a/artemis-docker/prepare-docker.sh +++ b/artemis-docker/prepare-docker.sh @@ -51,6 +51,7 @@ then rm -rf $target/docker fi mkdir $target/docker -cp ./{Dockerfile-centos,Dockerfile-ubuntu,docker-run.sh} $target/docker +cp ./Dockerfile-* $target/docker +cp ./docker-run.sh $target/docker echo "Docker file support files at : $target/docker" diff --git a/artemis-docker/readme.md b/artemis-docker/readme.md index 49f37500f3..ce4905ed7f 100644 --- a/artemis-docker/readme.md +++ b/artemis-docker/readme.md @@ -1,6 +1,6 @@ # Docker Image Example -This is an example on how you could create your own Docker Image For Apache ActiveMQ Artemis based on CentOS or Ubuntu. +This is an example on how you could create your own Docker Image For Apache ActiveMQ Artemis based on CentOS or Debian. # Preparing Use the script ./prepare-docker.sh as it will copy the docker files under the binary distribution. @@ -13,11 +13,11 @@ $ ./prepare-docker.sh $ARTEMIS_HOME Go to `$ARTEMIS_HOME` where you prepared the binary with Docker files. -## For Ubuntu: +## For Debian: From within the `$ARTEMIS_HOME` folder: ``` -$ docker build -f ./docker/Dockerfile-ubuntu -t artemis-ubuntu . +$ docker build -f ./docker/Dockerfile-debian -t artemis-debian . ``` ## For CentOS @@ -28,7 +28,7 @@ $ docker build -f ./docker/Dockerfile-centos -t artemis-centos . ``` **Note:** -`-t artemis-ubuntu`,`-t artemis-centos` are just tag names for the purpose of this guide +`-t artemis-debian`,`-t artemis-centos` are just tag names for the purpose of this guide # Variables: