Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Streamline image build (no tls, use podman) #10

Merged
merged 3 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 52 additions & 41 deletions .github/workflows/build-postgres-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- main
- main

permissions:
# Checkout repository
Expand All @@ -15,45 +15,56 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

env:
IMAGE_NAME: ghcr.io/gardenlinux/glvd-postgres
IMAGE_TAG: latest

steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64,linux/arm64

- name: Docker meta
id: meta
if: ${{ github.event_name != 'pull_request' }}
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ github.repository }}
tags: |
type=edge
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}

- name: Login to GitHub Container Registry
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push image
if: ${{ github.event_name != 'pull_request' }}
uses: docker/build-push-action@v6
with:
platforms: linux/amd64,linux/arm64
file: Containerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- name: Checkout repo
uses: actions/checkout@v4

- name: Install qemu dependency for multi-arch build
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static

- name: Build Image
id: build_image
uses: redhat-actions/buildah-build@v2
with:
image: ${{ env.IMAGE_NAME }}
tags: ${{ env.IMAGE_TAG }}
platforms: linux/amd64, linux/arm64
containerfiles: |
./Containerfile

- name: Echo Outputs
run: |
echo "Image: ${{ steps.build_image.outputs.image }}"
echo "Tags: ${{ steps.build_image.outputs.tags }}"
echo "Tagged Image: ${{ steps.build_image.outputs.image-with-tag }}"

- name: Check images created
run: buildah images | grep '${{ env.IMAGE_NAME }}'

- name: Check manifest
run: |
set -x
buildah manifest inspect ${{ steps.build_image.outputs.image }}:${{ env.IMAGE_TAG }}

- name: Push To ghcr.io
id: push-to-ghcr
if: ${{ github.event_name != 'pull_request' }}
uses: redhat-actions/push-to-registry@v2
with:
image: ${{ steps.build_image.outputs.image }}
tags: ${{ steps.build_image.outputs.tags }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Print image url
if: ${{ github.event_name != 'pull_request' }}
run: echo "Image pushed to ${{ steps.push-to-ghcr.outputs.registry-paths }}"
1 change: 0 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ FROM $base
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends postgresql-15-debversion && \
echo 'CREATE EXTENSION debversion' > /docker-entrypoint-initdb.d/create-extension.sql

ADD create-certificate.sh /docker-entrypoint-initdb.d
ADD postgresql.conf /etc/postgresql/
12 changes: 0 additions & 12 deletions create-certificate.sh

This file was deleted.

21 changes: 11 additions & 10 deletions postgresql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,17 @@ listen_addresses = '*'

# - SSL -

ssl = on
ssl_ca_file = ''
ssl_cert_file = '/var/lib/postgresql/data/pgdata/server.crt'
ssl_crl_file = ''
ssl_crl_dir = ''
ssl_key_file = '/var/lib/postgresql/data/pgdata/server.key'
ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
ssl_prefer_server_ciphers = on
ssl_ecdh_curve = 'prime256v1'
ssl_min_protocol_version = 'TLSv1.2'
#FIXME(fwilhe): disable for now, see https://github.com/gardenlinux/glvd/issues/106
# ssl = on
# ssl_ca_file = ''
# ssl_cert_file = '/var/lib/postgresql/data/pgdata/server.crt'
# ssl_crl_file = ''
# ssl_crl_dir = ''
# ssl_key_file = '/var/lib/postgresql/data/pgdata/server.key'
# ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
# ssl_prefer_server_ciphers = on
# ssl_ecdh_curve = 'prime256v1'
# ssl_min_protocol_version = 'TLSv1.2'
#ssl_max_protocol_version = ''
#ssl_dh_params_file = ''
#ssl_passphrase_command = ''
Expand Down