Skip to content

Commit b94d466

Browse files
committed
upgrading AFNI to latest version
1 parent bd9d9fb commit b94d466

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/Dockerfiles/AFNI.23.3.09-jammy.Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
# License for more details.
1414

1515
# You should have received a copy of the GNU Lesser General Public
16-
# License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
16+
1717
FROM ghcr.io/fcp-indi/c-pac/fsl:6.0.6.5-jammy as FSL
1818
FROM ghcr.io/fcp-indi/c-pac/ubuntu:jammy-non-free as AFNI
1919
USER root
20-
ENV AFNI_VERSION="23.3.09"
20+
21+
ENV AFNI_VERSION="25.1.08"
22+
2123
# To use the same Python environment to share common libraries
2224
COPY --from=FSL /usr/share/fsl/6.0 /usr/share/fsl/6.0
2325
ENV FSLDIR=/usr/share/fsl/6.0 \
@@ -28,6 +30,7 @@ ENV FSLDIR=/usr/share/fsl/6.0 \
2830
COPY dev/docker_data/required_afni_pkgs.txt /opt/required_afni_pkgs.txt
2931
COPY dev/docker_data/checksum/AFNI.${AFNI_VERSION}.sha384 /tmp/AFNI.${AFNI_VERSION}.sha384
3032
ENV PATH=/opt/afni:$PATH
33+
3134
RUN apt-get update \
3235
&& apt-get install -y --no-install-recommends \
3336
apt-transport-https \
@@ -109,23 +112,20 @@ RUN apt-get update \
109112
&& mkdir /opt/afni \
110113
&& tar -xvf afni-AFNI_${AFNI_VERSION}.tar.gz -C /opt/afni --strip-components 1 \
111114
&& rm -rf afni-AFNI_${AFNI_VERSION}.tar.gz \
112-
# Fix GLwDrawA per https://github.com/afni/afni/blob/AFNI_23.1.10/src/other_builds/OS_notes.linux_fedora_25_64.txt
113115
&& cd /usr/include/GL \
114116
&& mv GLwDrawA.h GLwDrawA.h.orig \
115117
&& sed 's/GLAPI WidgetClass/extern GLAPI WidgetClass/' GLwDrawA.h.orig > GLwDrawA.h \
116118
&& cd /opt/afni/src \
117119
&& sed '/^INSTALLDIR =/c INSTALLDIR = /opt/afni' other_builds/Makefile.linux_ubuntu_22_64 > Makefile \
118-
&& make vastness && make cleanest \
120+
&& make totality && make cleanest \
119121
&& cd /opt/afni \
120122
&& VERSION_STRING=$(afni --version) \
121123
&& VERSION_NAME=$(echo $VERSION_STRING | awk -F"'" '{print $2}') \
122-
# filter down to required packages
123124
&& cd /opt/afni/linux_openmp_64 \
124125
&& ls > ../full_ls \
125-
&& sed 's/linux_openmp_64\///g' /opt/required_afni_pkgs.txt | sort > ../required_ls \
126-
&& comm -2 -3 ../full_ls ../required_ls | xargs rm -rf \
126+
&& sed 's/linux_openmp_64\///g' /opt/required_afni_pkgs.txt | sed 's/\r//' | sort > ../required_ls \
127+
&& comm -2 -3 ../full_ls ../required_ls | xargs -r rm -rf \
127128
&& rm -f ../full_ls ../required_ls \
128-
# get rid of stuff we just needed for building
129129
&& apt-get remove -y \
130130
bzip2 \
131131
cmake \

0 commit comments

Comments
 (0)