diff --git a/.travis.yml b/.travis.yml index 7f7354767..d15d6ed31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,8 @@ script: - echo "$version-$branch-$rev" - npm version "$version-$branch-$rev" --force || true - docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower - sh -c "npm install && bower install && grunt package" + sh -c "npm install && npm run build" - docker build . --target ospos -t ospos - - docker-compose -f docker-compose.test.yml up --abort-on-container-exit - docker build database/ -t jekkos/opensourcepos:sqlscript env: global: diff --git a/Dockerfile b/Dockerfile index 4e03d2b20..25a2d7dfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-apache AS ospos +FROM php:8-apache AS ospos LABEL maintainer="jekkos" RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -13,7 +13,7 @@ RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/time WORKDIR /app COPY . /app RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html -RUN chmod -R 750 /app/writable/uploads /app/writable/logs && chown -R www-data:www-data /app/writable /app/application +RUN chmod -R 750 /app/writable/uploads /app/writable/logs && chown -R www-data:www-data /app/writable FROM ospos AS ospos_test diff --git a/docker-compose.yml b/docker-compose.yml index 092b5276c..76909bbf2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: image: jekkos/opensourcepos:sqlscript command: /bin/sh -c 'exit 0' ospos: - image: jekkos/opensourcepos:3.4.0 + image: jekkos/opensourcepos:3.3.8 restart: always depends_on: - mysql