From 664925d24617a3216c4b504571cb8032b16b5f0b Mon Sep 17 00:00:00 2001 From: BluemediaGER Date: Sun, 9 Jul 2023 22:15:15 +0200 Subject: [PATCH 1/2] Migrate to Woodpecker CI --- .drone.yml | 19 ------------------- .woodpecker/docker.yaml | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 19 deletions(-) delete mode 100644 .drone.yml create mode 100644 .woodpecker/docker.yaml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index a9d59d2..0000000 --- a/.drone.yml +++ /dev/null @@ -1,19 +0,0 @@ -kind: pipeline -type: docker -name: nginx-live - -steps: -- name: docker - image: plugins/docker - settings: - pull_image: true - no_cache: true - repo: git.bluemedia.dev/bluemedia/nginx-live - tags: - - latest - purge: true - registry: git.bluemedia.dev - username: - from_secret: docker_username - password: - from_secret: docker_password \ No newline at end of file diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml new file mode 100644 index 0000000..318e40c --- /dev/null +++ b/.woodpecker/docker.yaml @@ -0,0 +1,25 @@ +steps: + docker: + image: woodpeckerci/plugin-docker-buildx + secrets: [docker_username, docker_password] + settings: + pull_image: true + registry: git.bluemedia.dev + repo: git.bluemedia.dev/bluemedia/nginx-live + platforms: linux/amd64,linux/arm/v6,linux/arm64/v8 + tag: latest + + notify: + image: deblan/woodpecker-email + settings: + from.address: + from_secret: smtp_notify_email + from.name: Woodpecker CI + host: + from_secret: smtp_notify_host + username: + from_secret: smtp_notify_email + password: + from_secret: smtp_notify_password + when: + - status: [ failure ] From 558f984f4341f7a24903cdf2b32eef9b1d4f09d2 Mon Sep 17 00:00:00 2001 From: BluemediaGER Date: Sun, 9 Jul 2023 22:16:42 +0200 Subject: [PATCH 2/2] Use bitnami minideb --- Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4773b7..7cc792d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base Image used to create this Image -FROM debian:bullseye-slim +FROM bitnami/minideb:bullseye # Maintainer LABEL maintainer="hi@bluemedia.dev" @@ -11,12 +11,7 @@ ENV HLS_FRAGMENT_LENGTH 3 ENV HLS_PLAYLIST_LENGTH 20 # Update and install packages -RUN apt update -y && \ - apt upgrade -y && \ - apt autoremove -y && \ - apt install nginx libnginx-mod-rtmp -y && \ - apt clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN install_packages nginx libnginx-mod-rtmp # Create nginx user RUN useradd -s /bin/false nginx