HDDS-10167. Publish docker image for Ozone 1.4.0 (#26)
diff --git a/Dockerfile b/Dockerfile
index 5682596..bd4c04a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/ozone-runner:20220623-1
-ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.3.0/ozone-1.3.0.tar.gz
+FROM apache/ozone-runner:20230615-1
+ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.4.0/ozone-1.4.0.tar.gz
WORKDIR /opt
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
diff --git a/build.sh b/build.sh
index 022b590..456f405 100755
--- a/build.sh
+++ b/build.sh
@@ -15,13 +15,19 @@
# limitations under the License.
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
set -eu
+
mkdir -p build
-if [ ! -d "$DIR/build/apache-rat-0.15" ]; then
+
+ozone_version=1.4.0
+rat_version=0.16
+
+if [ ! -d "$DIR/build/apache-rat-${rat_version}" ]; then
if type wget 2> /dev/null; then
- wget "https://dlcdn.apache.org/creadur/apache-rat-0.15/apache-rat-0.15-bin.tar.gz" -O "$DIR/build/apache-rat.tar.gz"
+ wget "https://dlcdn.apache.org/creadur/apache-rat-${rat_version}/apache-rat-${rat_version}-bin.tar.gz" -O "$DIR/build/apache-rat.tar.gz"
elif type curl 2> /dev/null; then
- curl -LSs "https://dlcdn.apache.org/creadur/apache-rat-0.15/apache-rat-0.15-bin.tar.gz" -o "$DIR/build/apache-rat.tar.gz"
+ curl -LSs "https://dlcdn.apache.org/creadur/apache-rat-${rat_version}/apache-rat-${rat_version}-bin.tar.gz" -o "$DIR/build/apache-rat.tar.gz"
else
exit 1
fi
@@ -29,6 +35,8 @@
tar zvxf apache-rat.tar.gz
cd -
fi
-java -jar $DIR/build/apache-rat-0.15/apache-rat-0.15.jar $DIR -e .dockerignore -e public -e apache-rat-0.15 -e .git -e .gitignore
+
+java -jar $DIR/build/apache-rat-${rat_version}/apache-rat-${rat_version}.jar $DIR -e .dockerignore -e public -e apache-rat-${rat_version} -e .git -e .gitignore
+
docker build --build-arg OZONE_URL -t apache/ozone $@ .
-docker tag apache/ozone apache/ozone:1.3.0
+docker tag apache/ozone apache/ozone:${ozone_version}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 08cdcae..6e14523 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,14 +17,14 @@
version: "3"
services:
datanode:
- image: apache/ozone:1.3.0
+ image: apache/ozone:1.4.0
ports:
- 9864
command: ["ozone","datanode"]
env_file:
- ./docker-config
om:
- image: apache/ozone:1.3.0
+ image: apache/ozone:1.4.0
ports:
- 9874:9874
environment:
@@ -34,7 +34,7 @@
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone:1.3.0
+ image: apache/ozone:1.4.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.3.0
+ image: apache/ozone:1.4.0
ports:
- 9888:9888
env_file:
- ./docker-config
command: ["ozone","recon"]
s3g:
- image: apache/ozone:1.3.0
+ image: apache/ozone:1.4.0
ports:
- 9878:9878
env_file:
