👔 Don't rely on ${GITHUB_BRANCH} locally

FCP-INDI · Jan 26, 2024 · 2bec671 · 2bec671
1 parent c706bf2
commit 2bec671
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/.github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile b/.github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fcp-indi/c-pac/stage-base:abcd-hcp-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:abcd-hcp-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image with software dependencies version-matched to [ABCD-HCP BIDS fMRI Pipeline](https://github.com/DCAN-Labs/abcd-hcp-pipeline/blob/e480a8f99534f1b05f37bf44c64827384b69b383/Dockerfile)"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile b/.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fcp-indi/c-pac/stage-base:fmriprep-lts-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:fmriprep-lts-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image with software dependencies version-matched to [fMRIPrep LTS](https://reproducibility.stanford.edu/fmriprep-lts#long-term-support-lts)"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/.github/Dockerfiles/C-PAC.develop-jammy.Dockerfile b/.github/Dockerfiles/C-PAC.develop-jammy.Dockerfile
@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/.github/Dockerfiles/C-PAC.develop-lite-jammy.Dockerfile b/.github/Dockerfiles/C-PAC.develop-lite-jammy.Dockerfile
@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image without FreeSurfer"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/.github/Dockerfiles/base-standard.Dockerfile b/.github/Dockerfiles/base-standard.Dockerfile
@@ -16,7 +16,7 @@
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
 FROM ghcr.io/fcp-indi/c-pac/freesurfer:6.0.0-min.neurodocker-jammy as FreeSurfer
 
-FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.7.dev1
 LABEL org.opencontainers.image.description "NOT INTENDED FOR USE OTHER THAN AS A STAGE IMAGE IN A MULTI-STAGE BUILD \
 Standard software dependencies for C-PAC standard images"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC

diff --git a/.github/scripts/autoversioning.sh b/.github/scripts/autoversioning.sh
@@ -31,17 +31,23 @@ else
     find ./CPAC/resources/configs -name "*.yml" -exec sed -i'' -r "${_SED_COMMAND}" {} \;
 fi
 git add version
-VERSIONS=($(git diff origin/${GITHUB_BRANCH} -- version | tail -n 2))
+VERSIONS=( `git show $(git log --pretty=format:'%h' -n 2 version | tail -n 1):version` `cat version` )
 export PATTERN="(declare|typeset) -a"
 if [[ "$(declare -p VERSIONS)" =~ $PATTERN ]]
 then
   for DOCKERFILE in $(find ./.github/Dockerfiles -name "*.Dockerfile")
   do
     export IFS=""
-    for LINE in $(grep "FROM ghcr\.io/fcp\-indi/c\-pac/.*\-${VERSIONS[0]:1}" ${DOCKERFILE})
+    for LINE in $(grep "FROM ghcr\.io/fcp\-indi/c\-pac/.*\-${VERSIONS[0]}" ${DOCKERFILE})
     do
       echo "Updating stage tags in ${DOCKERFILE}"
-      sed -i "s/\-${VERSIONS[0]:1}/\-${VERSIONS[1]:1}/g" ${DOCKERFILE}
+      if [[ "$OSTYPE" == "darwin"* ]]; then
+          # Mac OSX
+          sed -i "" "s/\-${VERSIONS[0]}/\-${VERSIONS[1]}/g" ${DOCKERFILE}
+      else
+          # Linux and others
+          sed -i "s/\-${VERSIONS[0]}/\-${VERSIONS[1]}/g" ${DOCKERFILE}
+      fi
     done
   done
   unset IFS

diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/variant-ABCD-HCP.Dockerfile b/variant-ABCD-HCP.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fcp-indi/c-pac/stage-base:abcd-hcp-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:abcd-hcp-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image with software dependencies version-matched to [ABCD-HCP BIDS fMRI Pipeline](https://github.com/DCAN-Labs/abcd-hcp-pipeline/blob/e480a8f99534f1b05f37bf44c64827384b69b383/Dockerfile)"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/variant-fMRIPrep-LTS.Dockerfile b/variant-fMRIPrep-LTS.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fcp-indi/c-pac/stage-base:fmriprep-lts-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:fmriprep-lts-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image with software dependencies version-matched to [fMRIPrep LTS](https://reproducibility.stanford.edu/fmriprep-lts#long-term-support-lts)"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root

diff --git a/variant-lite.Dockerfile b/variant-lite.Dockerfile
@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.6.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.7.dev1
 LABEL org.opencontainers.image.description "Full C-PAC image without FreeSurfer"
 LABEL org.opencontainers.image.source https://github.com/FCP-INDI/C-PAC
 USER root