Skip to content

Commit e0e2d0f

Browse files
committed
chore: drop usage of -integration docker image
Signed-off-by: Ferdinand Thiessen <[email protected]>
1 parent 65135bb commit e0e2d0f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

build/integration/run-docker.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ function prepareDocker() {
151151
docker cp - $NEXTCLOUD_LOCAL_CONTAINER:/nextcloud/ < "$NEXTCLOUD_LOCAL_TAR"
152152
docker exec $NEXTCLOUD_LOCAL_CONTAINER chown -R www-data:www-data /nextcloud
153153

154+
# Install Nextcloud in the container
155+
docker exec -w /nextcloud $NEXTCLOUD_LOCAL_CONTAINER composer install
156+
154157
# Database options are needed only when a database other than SQLite is
155158
# used.
156159
NEXTCLOUD_LOCAL_CONTAINER_INSTALL_DATABASE_OPTIONS=""
@@ -159,7 +162,7 @@ function prepareDocker() {
159162
fi
160163

161164
echo "Installing Nextcloud in the container"
162-
docker exec --user www-data $NEXTCLOUD_LOCAL_CONTAINER bash -c "cd nextcloud && php occ maintenance:install --admin-pass=admin $NEXTCLOUD_LOCAL_CONTAINER_INSTALL_DATABASE_OPTIONS"
165+
docker exec --user www-data --workdir /nextcloud $NEXTCLOUD_LOCAL_CONTAINER php occ maintenance:install --admin-pass=admin $NEXTCLOUD_LOCAL_CONTAINER_INSTALL_DATABASE_OPTIONS
163166
}
164167

165168
# Removes/stops temporal elements created/started by this script.
@@ -200,9 +203,8 @@ trap cleanUp EXIT
200203
cd "$(dirname $0)"
201204

202205
# "--image XXX" option can be provided to set the Docker image to use to run
203-
# the integration tests (one of the "nextcloudci/phpX.Y:phpX.Y-Z" or
204-
# "ghcr.io/nextcloud/continuous-integration-integration-phpX.Y:latest" images).
205-
NEXTCLOUD_LOCAL_IMAGE="ghcr.io/nextcloud/continuous-integration-integration-php8.2:latest"
206+
# the integration tests (one of the "nextcloud/continuous-integration-phpX.Y:latest" images).
207+
NEXTCLOUD_LOCAL_IMAGE="ghcr.io/nextcloud/continuous-integration-php8.3:latest"
206208
if [ "$1" = "--image" ]; then
207209
NEXTCLOUD_LOCAL_IMAGE=$2
208210

0 commit comments

Comments
 (0)