From 492d23b9f801bcc1b552e00c2022074c69ba6e45 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 22 Mar 2022 22:58:08 +0100 Subject: [PATCH] Removed homebrew due to arm64 issues --- CHANGELOG.md | 3 +++ Dockerfiles/work/Dockerfile-5.2 | 12 ------------ Dockerfiles/work/Dockerfile-5.3 | 12 ------------ Dockerfiles/work/Dockerfile-5.4 | 12 ------------ Dockerfiles/work/Dockerfile-5.5 | 12 ------------ Dockerfiles/work/Dockerfile-5.6 | 12 ------------ Dockerfiles/work/Dockerfile-7.0 | 12 ------------ Dockerfiles/work/Dockerfile-7.1 | 12 ------------ Dockerfiles/work/Dockerfile-7.2 | 12 ------------ Dockerfiles/work/Dockerfile-7.3 | 12 ------------ Dockerfiles/work/Dockerfile-7.4 | 12 ------------ Dockerfiles/work/Dockerfile-8.0 | 12 ------------ Dockerfiles/work/Dockerfile-8.1 | 12 ------------ Dockerfiles/work/Dockerfile-8.2 | 12 ------------ build/ansible/group_vars/all/work.yml | 16 +--------------- 15 files changed, 4 insertions(+), 171 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6976f6c..f410dfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ #### Changed - Ensured CI tests are platform agnostic (amd64 vs arm64) +#### Removed +- Removed homebrew due to arm64 issues + ## Release 0.136 diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c456c20..cbf7ec9 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -206,18 +206,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- linkcheck -------------------- && curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 45e2f88..60efb28 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -228,18 +228,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- linkcheck -------------------- && curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 78f9697..08af2e9 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -246,18 +246,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index cd71505..7994398 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -251,18 +251,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index a5e5a4c..1cbeb1b 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -267,18 +267,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a71c7fe..200f33e 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -248,18 +248,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 0297253..2846de4 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -247,18 +247,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 77224d0..d1e9842 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -266,18 +266,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 6256b72..74a2793 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -267,18 +267,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index e7f7d23..9aef324 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -267,18 +267,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index fdc894d..866aec2 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -220,18 +220,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 84b178d..a311eaf 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -220,18 +220,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- laravel -------------------- && git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \ && cd /usr/local/src/laravel-installer \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 782152c..4717f82 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -220,18 +220,6 @@ RUN set -eux \ && cd / && rm -rf /tmp/gitflow \ \ \ -# -------------------- homebrew -------------------- - && git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \ -&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}" >> /home/devilbox/${v}' \ -&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \ -'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \ -&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \ - \ - \ # -------------------- linkcheck -------------------- && curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 1e01e7f..1e94181 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -94,10 +94,9 @@ software_enabled: - drush9 - drupalconsole - gitflow - - homebrew + #- homebrew - laravel - linkcheck - # - linuxbrew - mhsendmail - mysqldumpsecure - phalcon @@ -709,19 +708,6 @@ software_available: command: | curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ - linuxbrew: - check: su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' - all: - command: | - git clone https://github.com/Linuxbrew/brew.git /usr/local/src/linuxbrew \ - && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/linuxbrew \ - && v="${BASH_PROFILE}" su ${MY_USER} -c -p \ - 'echo "PATH=/usr/local/src/linuxbrew/bin:/usr/local/src/linuxbrew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \ - && v="${BASH_PROFILE}" su ${MY_USER} -c -p \ - 'echo "export MANPATH=/usr/local/src/linuxbrew/share/man:${MANPATH}" >> /home/devilbox/${v}' \ - && v="${BASH_PROFILE}" su ${MY_USER} -c -p \ - 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ mhsendmail: all: command: |