Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance docker images #75

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Enhance docker images #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28beb6
modify: temporarily disable sunet image
MahdiBaghbani Feb 28, 2024
065f66c
update: ownCloud and Nextcloud versions
MahdiBaghbani Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions docker/build/all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 0 additions & 2 deletions docker/dockerfiles/owncloud-ocm-test-suite.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docker/dockerfiles/owncloud-opencloudmesh.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker/dockerfiles/owncloud-rd-sram.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion docker/dockerfiles/owncloud.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/push/all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker/push/sunet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading