diff --git a/.github/workflows/docker-image_demo.yml b/.github/workflows/docker-image_demo.yml index 6f699c7..590ce51 100644 --- a/.github/workflows/docker-image_demo.yml +++ b/.github/workflows/docker-image_demo.yml @@ -13,17 +13,17 @@ jobs: steps: - - uses: actions/checkout@v2 - - - name: docker login - env: - DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + - uses: actions/checkout@v2 + + - name: docker login + env: + DOCKER_USER: ${{secrets.DOCKER_USER}} + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + run: | + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + + - name: Build the Docker image + run: docker build . --file Dockerfile --build-arg NODE_ENV=demo --tag vincentberry/vmix-remote:demo - - name: Build the Docker image - run: docker build . --file Dockerfile --tag vincentberry/vmix-remote:demo - - - name: Docker Push - run: docker push --all-tags vincentberry/vmix-remote + - name: Docker Push + run: docker push --all-tags vincentberry/vmix-remote \ No newline at end of file diff --git a/.github/workflows/docker-image_dev.yml b/.github/workflows/docker-image_dev.yml index deb7343..99156b8 100644 --- a/.github/workflows/docker-image_dev.yml +++ b/.github/workflows/docker-image_dev.yml @@ -14,6 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 + - name: docker login env: DOCKER_USER: ${{secrets.DOCKER_USER}} @@ -22,7 +23,7 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - name: Build the Docker image - run: docker build . --file Dockerfile --tag vincentberry/vmix-remote:dev + run: docker build . --file Dockerfile --build-arg NODE_ENV=dev --tag vincentberry/vmix-remote:dev - name: Docker Push - run: docker push --all-tags vincentberry/vmix-remote + run: docker push --all-tags vincentberry/vmix-remote \ No newline at end of file diff --git a/.github/workflows/docker-image_main.yml b/.github/workflows/docker-image_main.yml index 4f2138e..1efb869 100644 --- a/.github/workflows/docker-image_main.yml +++ b/.github/workflows/docker-image_main.yml @@ -13,19 +13,20 @@ jobs: steps: - - uses: actions/checkout@v2 - - name: docker login - env: - DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + - uses: actions/checkout@v2 + + - name: docker login + env: + DOCKER_USER: ${{secrets.DOCKER_USER}} + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + run: | + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + + - name: Build the Docker image + run: docker build . --file Dockerfile --build-arg NODE_ENV=prod --tag vincentberry/vmix-remote:latest - - name: Build the Docker image - run: docker build . --file Dockerfile --tag vincentberry/vmix-remote:latest - - - name: Build the Docker image - run: docker build . --file Dockerfile --tag vincentberry/vmix-remote:$(date +%s) - - - name: Docker Push - run: docker push --all-tags vincentberry/vmix-remote + - name: Build the Docker image + run: docker build . --file Dockerfile --build-arg NODE_ENV=prod --tag vincentberry/vmix-remote:$(date +%s) + + - name: Docker Push + run: docker push --all-tags vincentberry/vmix-remote \ No newline at end of file diff --git a/.gitignore b/.gitignore index 41f2ff3..a9884f7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,18 @@ /app/file/ /app/db/ .vscode/ -database.sqlite \ No newline at end of file +database.sqlite + +# Ignore les fichiers générés par SCSS +*.css +*.css.map + +# Ignore les fichiers générés par Sass/SCSS +.sass-cache/ +/app/public/assets/style +/app/public/assets/js + + +#npm ignore +/node_modules +package-lock.json \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 715e8e4..94e1c65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,20 @@ +FROM node:14 AS build +ARG NODE_ENV +WORKDIR /build + +COPY ./ /build + +RUN npm install +RUN npm install typescript + + +RUN npm run build-${NODE_ENV} + FROM php:apache +ARG NODE_ENV ENV COMPOSER_ALLOW_SUPERUSER=1 +ARG NODE_ENV EXPOSE 80 WORKDIR /var/www/html/ @@ -18,9 +32,12 @@ RUN apt-get update -qq && \ RUN docker-php-ext-install -j$(nproc) opcache pdo_mysql # Apache -COPY config/prod/apache2/conf-available/swag.conf /etc/apache2/conf-available/swag.conf -COPY /config/prod/apache2/sites-enabled /etc/apache2/sites-enabled/ -COPY app/ /var/www/html/ +COPY config/${NODE_ENV}/apache2/conf-available/swag.conf /etc/apache2/conf-available/swag.conf +COPY /config/${NODE_ENV}/apache2/sites-enabled /etc/apache2/sites-enabled/ +COPY --from=build /build/app/ /var/www/html/ +COPY app/src/inc/${NODE_ENV}/ /var/www/html/inc/ + +RUN rm -rf /var/www/html/src RUN mkdir -p /var/www/html/file/ RUN mkdir -p /var/www/html/db/ diff --git a/app/inc/header.php b/app/inc/header.php index bc630fd..75d7878 100644 --- a/app/inc/header.php +++ b/app/inc/header.php @@ -1,5 +1,6 @@ +
@@ -22,3 +23,18 @@ +