From 4ac8e00528e5031eeaae40d6309fabb0ba8e0d0a Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 26 Jun 2023 19:57:08 +1000 Subject: [PATCH] Sed should be -i -e, not -ie --- .gitlab-ci.yml | 2 +- .gitlab-docker-manifest.yml | 1 - Dockerfile | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb44633..8d338a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ services: before_script: - if [ ! -d build-cache ]; then mkdir build-cache; fi -- sed -ie s'/https/http/' /etc/apk/repositories +- sed -i -e s'/https/http/' /etc/apk/repositories - HTTP_PROXY=http://proxy.dege.lan:3128 apk add git curl - docker info && docker version # env|sort diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml index 7e97d35..c1aa120 100644 --- a/.gitlab-docker-manifest.yml +++ b/.gitlab-docker-manifest.yml @@ -4,7 +4,6 @@ x86_64:build-manifest: - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION} - apk add --no-cache curl - - echo curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline - curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline - curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=mysql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline - curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=ldap ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline diff --git a/Dockerfile b/Dockerfile index 7fb1457..89e45b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM php:8.1-fpm-alpine # Change to http respositories, so they we can cache the install packages -RUN if [ -n ${HTTP_PROXY} ] ; then sed -ie s'/https/http/' /etc/apk/repositories; fi +RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi COPY docker/pecl_install /usr/local/bin/pecl_install # Tune PHP