Commit bc51f568 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Reubica contenidos, pone al día build y deploy

See merge request redmic-project/static-pages!17
parents eaf0e45d 01399bcb

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/packaging.yml'

    file: '/packaging-docker/docker-build.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-custom-image.yml'

    file: '/deployment-service/custom-image.yml'



stages:

  - pre-package

.dockerignore→build/.dockerignore

+0 −0

File moved.

View file

build/.env

0 → 100644
+1 −0
Original line number Diff line number Diff line 
NGINX_IMAGE_TAG=1.27.5-alpine3.21

Dockerfile→build/Dockerfile

+4 −4
Original line number Diff line number Diff line 
ARG NGINX_IMAGE_TAG

ARG NGINX_IMAGE_TAG=1-alpine



FROM nginx:${NGINX_IMAGE_TAG}



LABEL maintainer="info@redmic.es"



COPY static-pages.conf /etc/nginx/conf.d/default.conf

COPY content /usr/share/nginx/html



HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=10 \

	CMD wget --spider -q http://localhost/nginx-health || exit 1



COPY static-pages.conf /etc/nginx/conf.d/default.conf

COPY content /usr/share/nginx/html

build/compose.yaml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
services:

  static-pages:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/static-pages}:${IMAGE_TAG:-latest}

    build:

      context: .

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        NGINX_IMAGE_TAG: