Merge pull request #75 from pondersource/enhance-docker-images

Enhance docker images
pondersource · Feb 28, 2024 · 7a467cf · 7a467cf
2 parents 8bd5e17 + 065f66c
commit 7a467cf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -8,13 +8,13 @@ Docker images we use in development.
 
 upstream: [Nextcloud Server Official](https://github.com/nextcloud/server)
 
-branch: [v27.1.2](https://github.com/nextcloud/server/releases/tag/v27.1.2)
+branch: [v28.0.2](https://github.com/nextcloud/server/releases/tag/v28.0.2)
 
 ## ownCloud version
 
 upstream: [ownCloud Core Official](https://github.com/owncloud/core)
 
-branch: [v10.13.2](https://github.com/owncloud/core/releases/tag/v10.13.2)
+branch: [v10.14.0](https://github.com/owncloud/core/releases/tag/v10.14.0)
 
 # Debugging
 ## RD-SRAM

diff --git a/docker/build/all.sh b/docker/build/all.sh
@@ -34,15 +34,15 @@ docker build --build-arg CACHEBUST="default" --file ./dockerfiles/php-base.Docke
 echo Building pondersource/dev-stock-nextcloud
 docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud.Dockerfile --tag pondersource/dev-stock-nextcloud .
 
-echo Building pondersource/dev-stock-nextcloud-sunet
-docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-sunet.Dockerfile --tag pondersource/dev-stock-nextcloud-sunet .
+# echo Building pondersource/dev-stock-nextcloud-sunet
+# docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-sunet.Dockerfile --tag pondersource/dev-stock-nextcloud-sunet .
 
-cd simple-saml-php
+# cd simple-saml-php
 
-echo Building pondersource/dev-stock-simple-saml-php
-docker build --tag pondersource/dev-stock-simple-saml-php .
+# echo Building pondersource/dev-stock-simple-saml-php
+# docker build --tag pondersource/dev-stock-simple-saml-php .
 
-cd ..
+# cd ..
 
 echo Building pondersource/dev-stock-nextcloud-solid
 docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-solid.Dockerfile --tag pondersource/dev-stock-nextcloud-solid .

diff --git a/docker/dockerfiles/owncloud-ocm-test-suite.Dockerfile b/docker/dockerfiles/owncloud-ocm-test-suite.Dockerfile
@@ -49,8 +49,6 @@ RUN cd apps/sciencemesh && git pull
 RUN cd apps/sciencemesh && make
 RUN cd apps && ln --symbolic --force oc-opencloudmesh/opencloudmesh
 
-RUN cat /etc/ssl/certs/ca-certificates.crt >> /var/www/html/resources/config/ca-bundle.crt
-
 # this file can be overrided in docker run or docker compose.yaml. 
 # example: docker run --volume new-init.sh:/init.sh:ro
 COPY ./scripts/init-owncloud-sm-ocm.sh /init.sh

diff --git a/docker/dockerfiles/owncloud-opencloudmesh.Dockerfile b/docker/dockerfiles/owncloud-opencloudmesh.Dockerfile
@@ -36,7 +36,6 @@ RUN git clone                           \
     apps/oc-opencloudmesh
 
 RUN cd apps && ln --symbolic --force oc-opencloudmesh/opencloudmesh
-RUN cat /etc/ssl/certs/ca-certificates.crt >> /var/www/html/resources/config/ca-bundle.crt
 
 # this file can be overrided in docker run or docker compose.yaml. 
 # example: docker run --volume new-init.sh:/init.sh:ro

diff --git a/docker/dockerfiles/owncloud-rd-sram.Dockerfile b/docker/dockerfiles/owncloud-rd-sram.Dockerfile
@@ -24,6 +24,7 @@ RUN git clone                           \
 RUN cd apps && ln --symbolic --force rd-sram-integration/federatedgroups
 
 COPY ./rd-sram/curls /curls
+
 # this file can be overrided in docker run or docker compose.yaml. 
 # example: docker run --volume new-init.sh:/init.sh:ro
 COPY ./scripts/init-owncloud-rd-sram.sh /init.sh

diff --git a/docker/dockerfiles/owncloud.Dockerfile b/docker/dockerfiles/owncloud.Dockerfile
@@ -11,7 +11,7 @@ RUN rm --recursive --force /var/www/html
 USER www-data
 
 ARG REPO_OWNCLOUD=https://github.com/owncloud/core
-ARG BRANCH_OWNCLOUD=v10.13.2
+ARG BRANCH_OWNCLOUD=v10.14.0
 # CACHEBUST forces docker to clone fresh source codes from git.
 # example: docker build -t your-image --build-arg CACHEBUST="default" .
 # $RANDOM returns random number each time.
@@ -50,4 +50,5 @@ RUN composer install --no-dev
 RUN make install-nodejs-deps
 
 USER root
+RUN cat /etc/ssl/certs/ca-certificates.crt >> /var/www/html/resources/config/ca-bundle.crt
 CMD /usr/sbin/apache2ctl -DFOREGROUND & tail --follow /var/log/apache2/access.log & tail --follow /var/log/apache2/error.log & tail --follow data/owncloud.log
diff --git a/docker/push/all.sh b/docker/push/all.sh
@@ -13,9 +13,9 @@ docker push pondersource/dev-stock-php-base
 
 docker push pondersource/dev-stock-nextcloud
 
-docker push pondersource/dev-stock-nextcloud-sunet
+# docker push pondersource/dev-stock-nextcloud-sunet
 
-docker push pondersource/dev-stock-simple-saml-php
+# docker push pondersource/dev-stock-simple-saml-php
 
 docker push pondersource/dev-stock-nextcloud-solid
 

diff --git a/docker/push/sunet.sh b/docker/push/sunet.sh
@@ -5,5 +5,5 @@ set -e
 echo "Log in as pondersource"
 docker login
 
-docker push pondersource/dev-stock-nextcloud-sunet
-docker push pondersource/dev-stock-simple-saml-php
+# docker push pondersource/dev-stock-nextcloud-sunet
+# docker push pondersource/dev-stock-simple-saml-php