Skip to content

Commit b0dd635

Browse files
emerkle826emerkle826
authored
Upgrade DSE UBI images to 8 for ARM64 support (#320)
1 parent 5b8cd60 commit b0dd635

File tree

8 files changed

+30
-29
lines changed

8 files changed

+30
-29
lines changed

‎.github/workflows/ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297
uses: docker/metadata-action@v4
298298
with:
299299
images: datastax/dse-mgmtapi-6_8
300-
tags: type=sha,prefix=dse68-ubi7-
300+
tags: type=sha,prefix=dse68-ubi8-
301301
- name: Set up QEMU
302302
uses: docker/setup-qemu-action@v2
303303
- name: Set up Docker Buildx
@@ -310,11 +310,11 @@ jobs:
310310
- name: Set outputs
311311
id: vars
312312
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
313-
- name: Build and push DSE 6.8-ubi7
313+
- name: Build and push DSE 6.8-ubi8
314314
id: docker_build
315315
uses: docker/build-push-action@v3
316316
with:
317-
file: dse-68/Dockerfile.ubi7
317+
file: dse-68/Dockerfile.ubi8
318318
build-args: VERSION=dse68-jdk8-${{ steps.vars.outputs.sha_short }}
319319
context: .
320320
push: true

‎.github/workflows/docker-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
# id: docker_dse_ubi_build
105105
# uses: docker/build-push-action@v3
106106
# with:
107-
# file: dse-68/Dockerfile.ubi7
107+
# file: dse-68/Dockerfile.ubi8
108108
# build-args: VERSION=dse68-jdk8-${{ steps.vars.outputs.sha_short }}
109109
# context: .
110110
# push: false

‎.github/workflows/docker-release.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36]
13+
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37]
1414
image-base: [jdk8, jdk11]
1515
include:
16-
- dse-version: 6.8.36
16+
- dse-version: 6.8.37
1717
latest: true
1818
runs-on: ubuntu-latest
1919
steps:
@@ -101,15 +101,15 @@ jobs:
101101
--target dse68 \
102102
--platform linux/amd64,linux/arm64 .
103103
104-
build-dse-68-ubi7:
104+
build-dse-68-ubi8:
105105
needs: build-dse-68-ubuntu
106106
strategy:
107107
fail-fast: false
108108
matrix:
109-
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36]
110-
image-base: [ubi7]
109+
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37]
110+
image-base: [ubi8]
111111
include:
112-
- dse-version: 6.8.36
112+
- dse-version: 6.8.37
113113
latest: true
114114
runs-on: ubuntu-latest
115115
steps:

‎README.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,18 @@ Cassandra trunk (currently, these are nightly builds)
9797

9898
DSE 6.8.x
9999

100-
datastax/dse-mgmtapi-6_8:6.8.25 (jdk8, jdk11 and ubi7 based images)
101-
datastax/dse-mgmtapi-6_8:6.8.26 (jdk8, jdk11 and ubi7 based images)
102-
datastax/dse-mgmtapi-6_8:6.8.28 (jdk8, jdk11 and ubi7 based images)
103-
datastax/dse-mgmtapi-6_8:6.8.29 (jdk8, jdk11 and ubi7 based images)
104-
datastax/dse-mgmtapi-6_8:6.8.30 (jdk8, jdk11 and ubi7 based images)
105-
datastax/dse-mgmtapi-6_8:6.8.31 (jdk8, jdk11 and ubi7 based images)
106-
datastax/dse-mgmtapi-6_8:6.8.32 (jdk8, jdk11 and ubi7 based images)
107-
datastax/dse-mgmtapi-6_8:6.8.33 (jdk8, jdk11 and ubi7 based images)
108-
datastax/dse-mgmtapi-6_8:6.8.34 (jdk8, jdk11 and ubi7 based images)
109-
datastax/dse-mgmtapi-6_8:6.8.35 (jdk8, jdk11 and ubi7 based images)
110-
datastax/dse-mgmtapi-6_8:6.8.36 (jdk8, jdk11 and ubi7 based images)
100+
datastax/dse-mgmtapi-6_8:6.8.25 (jdk8, jdk11 and ubi8 based images)
101+
datastax/dse-mgmtapi-6_8:6.8.26 (jdk8, jdk11 and ubi8 based images)
102+
datastax/dse-mgmtapi-6_8:6.8.28 (jdk8, jdk11 and ubi8 based images)
103+
datastax/dse-mgmtapi-6_8:6.8.29 (jdk8, jdk11 and ubi8 based images)
104+
datastax/dse-mgmtapi-6_8:6.8.30 (jdk8, jdk11 and ubi8 based images)
105+
datastax/dse-mgmtapi-6_8:6.8.31 (jdk8, jdk11 and ubi8 based images)
106+
datastax/dse-mgmtapi-6_8:6.8.32 (jdk8, jdk11 and ubi8 based images)
107+
datastax/dse-mgmtapi-6_8:6.8.33 (jdk8, jdk11 and ubi8 based images)
108+
datastax/dse-mgmtapi-6_8:6.8.34 (jdk8, jdk11 and ubi8 based images)
109+
datastax/dse-mgmtapi-6_8:6.8.35 (jdk8, jdk11 and ubi8 based images)
110+
datastax/dse-mgmtapi-6_8:6.8.36 (jdk8, jdk11 and ubi8 based images)
111+
datastax/dse-mgmtapi-6_8:6.8.37 (jdk8, jdk11 and ubi8 based images)
111112

112113
### Cassandra trunk
113114

‎dse-68/Dockerfile.jdk11

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV DSE_HOME /opt/dse
1010
ENV DSE_AGENT_HOME /opt/agent
1111

1212
# Get commandline parameters
13-
ARG DSE_VERSION=6.8.36
13+
ARG DSE_VERSION=6.8.37
1414
ARG URL_PREFIX=https://downloads.datastax.com/enterprise
1515
ARG TARBALL=dse-${DSE_VERSION}-bin.tar.gz
1616
ARG DOWNLOAD_URL=${URL_PREFIX}/${TARBALL}

‎dse-68/Dockerfile.jdk8

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV DSE_HOME /opt/dse
1010
ENV DSE_AGENT_HOME /opt/agent
1111

1212
# Get commandline parameters
13-
ARG DSE_VERSION=6.8.36
13+
ARG DSE_VERSION=6.8.37
1414
ARG URL_PREFIX=https://downloads.datastax.com/enterprise
1515
ARG TARBALL=dse-${DSE_VERSION}-bin.tar.gz
1616
ARG DOWNLOAD_URL=${URL_PREFIX}/${TARBALL}

‎dse-68/Dockerfile.ubi7 ‎dse-68/Dockerfile.ubi8

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
ARG VERSION=6.8.36
3-
ARG BASETAG=7.8
2+
ARG VERSION=6.8.37
3+
ARG BASETAG=8.8
44

55
FROM datastax/dse-mgmtapi-6_8:${VERSION} AS dse-server-base
66

77
#############################################################
88

9-
# Based on ubi7 for Python 2 support, when moving to Python 3 use ubi8
10-
FROM registry.access.redhat.com/ubi7/ubi-minimal:${BASETAG} as dse68
9+
# Using UBI8 with Python 2 support, eventually we may switch to Python 3
10+
FROM registry.access.redhat.com/ubi8/ubi-minimal:${BASETAG} as dse68
1111

1212
LABEL maintainer="DataStax, Inc <info@datastax.com>"
1313
LABEL name="dse-server"
@@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
2424

2525
# Install runtime dependencies and updates
2626
RUN microdnf update && rm -rf /var/cache/yum && \
27-
microdnf install --nodocs -y java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel python zlib libaio which findutils hostname && microdnf clean all
27+
microdnf install --nodocs -y java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel python2 zlib libaio which findutils hostname iproute shadow-utils procps util-linux glibc-langpack-en && microdnf clean all
2828

2929
WORKDIR $HOME
3030

‎management-api-agent-dse-6.8/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</repository>
3030
</repositories>
3131
<properties>
32-
<dse.version>6.8.36</dse.version>
32+
<dse.version>6.8.37</dse.version>
3333
</properties>
3434
<dependencies>
3535
<dependency>

0 commit comments

Comments
 (0)