Skip to content

Commit

Permalink
Repo reorganization
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyTran732 authored Sep 9, 2024
1 parent fc9ad5b commit d12e8e1
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:

- name: Extract version for tags
run: |
echo "FULL_VERSION=$(grep -oP '(?<=VERSION=).*' Dockerfile)" >> $GITHUB_ENV
echo "MAJOR_VERSION=$(grep -oP '(?<=VERSION=).*' Dockerfile | head -c2)" >> $GITHUB_ENV
echo "FULL_VERSION=$(grep -oP '(?<=VERSION=).*' Alpine/Dockerfile)" >> $GITHUB_ENV
echo "MAJOR_VERSION=$(grep -oP '(?<=VERSION=).*' Alpine/Dockerfile | head -c2)" >> $GITHUB_ENV
# Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
id: build-and-push
uses: docker/build-push-action@v6
with:
context: .
context: Alpine
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-ubi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Extract version for tags
run: |
echo "FULL_VERSION=$(grep -oP '(?<=VERSION=).*' Dockerfile)" >> $GITHUB_ENV
echo "FULL_VERSION=$(grep -oP '(?<=VERSION=).*' UBI/Dockerfile)" >> $GITHUB_ENV
# Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
id: build-and-push
uses: docker/build-push-action@v6
with:
context: .
context: UBI
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
Expand Down
File renamed without changes.
17 changes: 17 additions & 0 deletions UBI/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ARG VERSION=11

FROM mariadb:${VERSION}-ubi

LABEL maintainer="Thien Tran [email protected]"

USER root

RUN microdnf -y upgrade \
&& rm -rf /usr/local/bin/gosu \
&& curl https://copr.fedorainfracloud.org/coprs/secureblue/hardened_malloc/repo/rhel-9/secureblue-hardened_malloc-rhel-9.repo \
-o /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:secureblue:hardened_malloc.repo \
&& microdnf install -y crypto-policies-scripts hardened_malloc \
&& update-crypto-policies --set FUTURE \
&& echo libhardened_malloc.so > /etc/ld.so.preload

USER mysql

0 comments on commit d12e8e1

Please sign in to comment.