HDDS-6015. Publish docker image for Ozone 1.2.0 (#22)
diff --git a/Dockerfile b/Dockerfile
index af6733f..bc713db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/ozone-runner:20210329-1
-ARG OZONE_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=ozone/1.1.0/ozone-1.1.0.tar.gz
+FROM apache/ozone-runner:20210520-1
+ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.2.0/ozone-1.2.0.tar.gz
WORKDIR /opt
-RUN sudo rm -rf /opt/hadoop && wget $OZONE_URL -O ozone.tar.gz && tar zxf ozone.tar.gz && rm ozone.tar.gz && mv ozone* hadoop
+RUN sudo rm -rf /opt/hadoop && curl -LSs -o ozone.tar.gz $OZONE_URL && tar zxf ozone.tar.gz && rm ozone.tar.gz && mv ozone* hadoop
WORKDIR /opt/hadoop
COPY log4j.properties /opt/hadoop/etc/hadoop/log4j.properties
COPY ozone-site.xml /opt/hadoop/etc/hadoop/ozone-site.xml
diff --git a/build.sh b/build.sh
index 68c34d4..a18d868 100755
--- a/build.sh
+++ b/build.sh
@@ -19,9 +19,9 @@
mkdir -p build
if [ ! -d "$DIR/build/apache-rat-0.13" ]; then
if type wget 2> /dev/null; then
- wget "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=creadur/apache-rat-0.13/apache-rat-0.13-bin.tar.gz" -O "$DIR/build/apache-rat.tar.gz"
+ wget "https://dlcdn.apache.org/creadur/apache-rat-0.13/apache-rat-0.13-bin.tar.gz" -O "$DIR/build/apache-rat.tar.gz"
elif type curl 2> /dev/null; then
- curl -LSs "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=creadur/apache-rat-0.13/apache-rat-0.13-bin.tar.gz" -o "$DIR/build/apache-rat.tar.gz"
+ curl -LSs "https://dlcdn.apache.org/creadur/apache-rat-0.13/apache-rat-0.13-bin.tar.gz" -o "$DIR/build/apache-rat.tar.gz"
else
exit 1
fi
@@ -30,5 +30,5 @@
cd -
fi
java -jar $DIR/build/apache-rat-0.13/apache-rat-0.13.jar $DIR -e .dockerignore -e public -e apache-rat-0.13 -e .git -e .gitignore
-docker build --build-arg OZONE_URL -t apache/ozone .
-docker tag apache/ozone apache/ozone:1.1.0
+docker build --build-arg OZONE_URL -t apache/ozone $@ .
+docker tag apache/ozone apache/ozone:1.2.0
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 56ae6f1..2cbb197 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,14 +17,14 @@
version: "3"
services:
datanode:
- image: apache/ozone:1.1.0
+ image: apache/ozone:1.2.0
ports:
- 9864
command: ["ozone","datanode"]
env_file:
- ./docker-config
om:
- image: apache/ozone:1.1.0
+ image: apache/ozone:1.2.0
ports:
- 9874:9874
environment:
@@ -34,7 +34,7 @@
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone:1.1.0
+ image: apache/ozone:1.2.0
ports:
- 9876:9876
env_file:
@@ -43,14 +43,14 @@
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["ozone","scm"]
recon:
- image: apache/ozone:1.1.0
+ image: apache/ozone:1.2.0
ports:
- 9888:9888
env_file:
- ./docker-config
command: ["ozone","recon"]
s3g:
- image: apache/ozone:1.1.0
+ image: apache/ozone:1.2.0
ports:
- 9878:9878
env_file:
