Skip to content

Commit

Permalink
Merge pull request #56 from pondersource/mac-compat
Browse files Browse the repository at this point in the history 
Make dev-stock compatible with Macintosh devices
  • Loading branch information
@MahdiBaghbani
MahdiBaghbani authored Dec 9, 2023
2 parents c491ed4 + e52f01e commit b1ade88
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions ci/ocm-test-suite.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function waitForPort () {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"

# copy init files.
cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh
cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh
cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh

docker run --detach --network=testnet \
--name=meshdir.docker \
Expand Down
2 changes: 1 addition & 1 deletion release/federatedgroups-owncloud.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BRANCH_OWNCLOUD_APP=release
[ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"

# copy init files.
cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${REPO_ROOT}/temp/oc-rd-sram.sh"
cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${REPO_ROOT}/temp/oc-rd-sram.sh"

# ownCloud federatedgroups source code.
[ ! -d "rd-sram-release" ] && \
Expand Down
2 changes: 1 addition & 1 deletion release/ocm-owncloud.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BRANCH_OWNCLOUD_APP=release
[ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"

# copy init files.
cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"

# ownCloud opencloudmesh source code.
[ ! -d "oc-ocm-release" ] && \
Expand Down
2 changes: 1 addition & 1 deletion release/sciencemesh-nextcloud.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BRANCH_OWNCLOUD_APP=nextcloud
[ ! -d "temp" ] && mkdir -p temp

# copy init file.
cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nc.sh
cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nc.sh

# add additional tagging for docker images.
docker tag pondersource/dev-stock-nextcloud-sciencemesh pondersource/dev-stock-nc1-sciencemesh
Expand Down
2 changes: 1 addition & 1 deletion release/sciencemesh-owncloud.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BRANCH_OWNCLOUD_APP=owncloud
[ ! -d "temp" ] && mkdir -p temp

# copy init file.
cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/oc.sh
cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/oc.sh

# add additional tagging for docker images.
docker tag pondersource/dev-stock-owncloud-sciencemesh pondersource/dev-stock-oc1-sciencemesh
Expand Down
2 changes: 1 addition & 1 deletion tests/base-nextcloud.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function waitForPort () {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"

# copy init files.
cp --force "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh"

# echo "starting firefox tester"
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
2 changes: 1 addition & 1 deletion tests/base-owncloud.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function waitForPort () {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"

# copy init files.
cp --force "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/oc-base.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/oc-base.sh"

echo "starting firefox tester"
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
6 changes: 3 additions & 3 deletions tests/ocm-test-suite.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ function waitForCollabora {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"

# copy init files.
cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh
cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
sudo rm --force --recursive "${ENV_ROOT}/temp/.X11-unix"
cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh
cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
sudo rm -rf "${ENV_ROOT}/temp/.X11-unix"

docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
2 changes: 1 addition & 1 deletion tests/rd-sram.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function waitForPort () {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"

# copy init files.
cp --force "${ENV_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${ENV_ROOT}/temp/oc-rd-sram.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${ENV_ROOT}/temp/oc-rd-sram.sh"

docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
docker run --detach --name=firefox-legacy --network=testnet -p 5900:5800 --shm-size 2g jlesage/firefox:v1.18.0
Expand Down
4 changes: 2 additions & 2 deletions tests/sciencemesh.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ function waitForCollabora {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"

# copy init files.
cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh
cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh
cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh

docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
2 changes: 1 addition & 1 deletion tests/sm-sram-ocm.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function waitForCollabora {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"

# copy init files.
cp --force ./docker/scripts/init-owncloud-sm-sram-ocm.sh ./temp/owncloud.sh
cp -f ./docker/scripts/init-owncloud-sm-sram-ocm.sh ./temp/owncloud.sh

docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
2 changes: 1 addition & 1 deletion tests/surf-trashbin.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function waitForPort () {
[ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"

# copy init files.
cp --force "${ENV_ROOT}/docker/scripts/init-owncloud-surf-trashbin.sh" "${ENV_ROOT}/temp/oc-surf-trashbin.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-surf-trashbin.sh" "${ENV_ROOT}/temp/oc-surf-trashbin.sh"

echo "starting firefox tester"
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
4 changes: 2 additions & 2 deletions tests/testing-ocm-nc-oc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ function waitForPort {
[ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"

# copy init files.
cp --force "${REPO_ROOT}/docker/scripts/init-nextcloud.sh" "${REPO_ROOT}/temp/nc-base.sh"
cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
cp -f "${REPO_ROOT}/docker/scripts/init-nextcloud.sh" "${REPO_ROOT}/temp/nc-base.sh"
cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"

echo "starting firefox tester"
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down
2 changes: 1 addition & 1 deletion tests/testing-ocm.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function waitForPort {
[ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"

# copy init files.
cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"

echo "starting firefox tester"
docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
Expand Down

0 comments on commit b1ade88

Please sign in to comment.