From 1ba52a5597895252dc98bd0388bdbbf409343011 Mon Sep 17 00:00:00 2001 From: Kai Muehlbauer Date: Thu, 24 Jun 2021 07:59:44 +0200 Subject: [PATCH] MNT: rename master -> main --- .github/workflows/main.yml | 6 +++--- README.md | 2 +- base/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c9a0df..acca59c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Build & Deploy on: push: - branches: [ master ] + branches: [ main ] release: types: - created @@ -48,7 +48,7 @@ jobs: - name: add env vars run: | if [ "${WRADLIB_VERSION}" == "" ]; then - echo "WRADLIB_VERSION=master" >> $GITHUB_ENV + echo "WRADLIB_VERSION=main" >> $GITHUB_ENV fi echo "WRADLIB_DOCKER_TAG=min" >> $GITHUB_ENV - name: build min image @@ -63,7 +63,7 @@ jobs: - name: add env vars run: | if [ "${WRADLIB_VERSION}" == "" ]; then - echo "WRADLIB_VERSION=master" >> $GITHUB_ENV + echo "WRADLIB_VERSION=main" >> $GITHUB_ENV fi echo "WRADLIB_DOCKER_TAG=full" >> $GITHUB_ENV - name: build full image diff --git a/README.md b/README.md index 7539388..3b4f5eb 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This repo consists of two docker files: - Dockerfile - builds tags `min` and `full` - - builds wradlib releases (prepending `X.Y.Z`) on tagged builds as well as latest `master` (prepending `master`) on non-tagged builds (via `cron`) + - builds wradlib releases (prepending `X.Y.Z`) on tagged builds as well as latest `main` (prepending `main`) on non-tagged builds (via `cron`) - min - based on `base` - with activated conda-forge wradlib environment diff --git a/base/Dockerfile b/base/Dockerfile index 7262bcc..fd821a5 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -15,8 +15,8 @@ RUN buildDeps="gcc \ make" && \ yum install -y ${buildDeps} && \ DIR=$(mktemp -d) && cd ${DIR} && \ - curl -LO https://github.com/ncopa/su-exec/archive/master.zip && \ - unzip master.zip && cd su-exec-master && \ + curl -LO https://github.com/ncopa/su-exec/archive/main.zip && \ + unzip main.zip && cd su-exec-main && \ make && \ cp su-exec /usr/local/bin/su-exec && \ cd / && \