You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2024/11/21 19:30:51 UTC
(ozone-docker) branch ozone-1.2.1-rocky updated (aca1f6e -> 98a3ce8)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a change to branch ozone-1.2.1-rocky
in repository https://gitbox.apache.org/repos/asf/ozone-docker.git
from aca1f6e HDDS-11632. Publish images to GitHub container repo (#32)
new 222e843 HDDS-11700. Use ozone-runner from GitHub in ozone image build (#33)
new 98a3ce8 HDDS-11767. Use closer.lua in Ozone images
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yaml | 4 ++++
Dockerfile | 9 +++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
(ozone-docker) 02/02: HDDS-11767. Use closer.lua in Ozone images
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch ozone-1.2.1-rocky
in repository https://gitbox.apache.org/repos/asf/ozone-docker.git
commit 98a3ce8536469c9f9d11e239b4ed8ae53283261e
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Thu Nov 21 07:31:55 2024 +0100
HDDS-11767. Use closer.lua in Ozone images
---
Dockerfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 08d32f4..c7a3319 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,9 @@
ARG OZONE_RUNNER_IMAGE=apache/ozone-runner
FROM ${OZONE_RUNNER_IMAGE}:20241121-1-jdk11
-ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.2.1/ozone-1.2.1.tar.gz
+ARG OZONE_VERSION=1.2.1
+ARG OZONE_URL="https://www.apache.org/dyn/closer.lua?action=download&filename=ozone/${OZONE_VERSION}/ozone-${OZONE_VERSION}.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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
(ozone-docker) 01/02: HDDS-11700. Use ozone-runner from GitHub in ozone image build (#33)
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch ozone-1.2.1-rocky
in repository https://gitbox.apache.org/repos/asf/ozone-docker.git
commit 222e843a978fa30b973e9a53fcf31a0d58c16db9
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Thu Nov 14 11:07:26 2024 +0100
HDDS-11700. Use ozone-runner from GitHub in ozone image build (#33)
---
.github/workflows/build.yaml | 4 ++++
Dockerfile | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a292f29..c79b265 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,6 +38,9 @@ permissions:
contents: read
packages: write
+env:
+ OZONE_RUNNER_IMAGE: ghcr.io/apache/ozone-runner
+
jobs:
build:
runs-on: ubuntu-latest
@@ -87,6 +90,7 @@ jobs:
if: ${{ steps.pull.outputs.success == 'false' }}
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
with:
+ build-args: OZONE_RUNNER_IMAGE
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile b/Dockerfile
index 6f2f534..08d32f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/ozone-runner:20240729-jdk11-1
+ARG OZONE_RUNNER_IMAGE=apache/ozone-runner
+FROM ${OZONE_RUNNER_IMAGE}:20241121-1-jdk11
+
ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.2.1/ozone-1.2.1.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
COPY log4j.properties /opt/hadoop/etc/hadoop/log4j.properties
COPY ozone-site.xml /opt/hadoop/etc/hadoop/ozone-site.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org