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

Merge branch 'dev' into 'master' 

Añade página para errores del servidor

See merge request redmic-project/static-pages!13
parents 2c019990 abeea34a

.gitlab-ci.yml

+38 −23
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ image: docker:stable 


variables:

  DOCKER_DRIVER: overlay2

  STACK: ${CI_PROJECT_NAME}

  SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}

  STATIC_SUBDOMAIN: static



services:

  - docker:dind
@@ -64,68 +69,78 @@ container-scanning: 
  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

deploy-supporting-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      STATIC_SUBDOMAIN=${STATIC_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://${STATIC_SUBDOMAIN}.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

    - branches

  except:

    - master

  when: manual



deploy-supporting-branch:

deploy-stable-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      STATIC_SUBDOMAIN=${STATIC_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://${STATIC_SUBDOMAIN}.${DEV_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual



deploy-supporting-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      STATIC_SUBDOMAIN=${STATIC_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${STATIC_SUBDOMAIN}.${PRO_PUBLIC_HOSTNAME}

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

deploy-stable-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      STATIC_SUBDOMAIN=${STATIC_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${STATIC_SUBDOMAIN}.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM nginx:alpine

FROM nginx:1.15-alpine



LABEL maintainer="info@redmic.es"

content/web-5xx/index.html

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<html>

	<head>

		<link rel="stylesheet" type="text/css" href="resources/style.css" >

	</head>

	<body>

		<div class="outerApp">

			<div class="accessGroup bgWhite">

				<div class="header">

					<div class="title">

						<img class="logoRedmic" src="resources/logo.svg">

						<h1 class="titleRedmic">REDMIC</h1>

					</div>

					<h4 class="subtitle">Repositorio de Datos Marinos Integrados de Canarias</h4>

				</div>

				<div class="boxLabel">

					<div>

						<span>

							Se ha producido un error en el servidor, disculpe las molestias. Vuelva a intentarlo en unos instantes.

						</span>

					</div>

				</div>

				<div class="boxLabel">

					<div>

						<span>

							An error occurred on the server, sorry for the inconvenience. Try again in a moment.

						</span>

					</div>

				</div>

			</div>

		</div>

	<body>

</html>

content/web-5xx/resources/background.png

0 → 100644
+450 KiB
Loading image diff...

content/web-5xx/resources/logo.svg

0 → 100644
+78 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<!-- Generator: Adobe Illustrator 15.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->



<svg

   xmlns:dc="http://purl.org/dc/elements/1.1/"

   xmlns:cc="http://creativecommons.org/ns#"

   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

   xmlns:svg="http://www.w3.org/2000/svg"

   xmlns="http://www.w3.org/2000/svg"

   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

   version="1.1"

   id="Layer_1"

   x="0px"

   y="0px"

   width="1150px"

   height="1150px"

   viewBox="0 0 1150 1150"

   enable-background="new 0 0 1150 1150"

   xml:space="preserve"

   inkscape:version="0.48.5 r10040"

   sodipodi:docname="logo_amarillo3.svg"

   inkscape:export-filename="C:\Users\nacho\Desktop\Responsive Web Logo is Responsive_files\favicon.png"

   inkscape:export-xdpi="90"

   inkscape:export-ydpi="90"><metadata

   id="metadata3073"><rdf:RDF><cc:Work

       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type

         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs

   id="defs3071">

		

		

		

	

	

	



			

		</defs><sodipodi:namedview

   pagecolor="#ffffff"

   bordercolor="#666666"

   borderopacity="1"

   objecttolerance="10"

   gridtolerance="10"

   guidetolerance="10"

   inkscape:pageopacity="0"

   inkscape:pageshadow="2"

   inkscape:window-width="1920"

   inkscape:window-height="1053"

   id="namedview3069"

   showgrid="false"

   inkscape:zoom="0.4912855"

   inkscape:cx="136.42104"

   inkscape:cy="427.41662"

   inkscape:window-x="1911"

   inkscape:window-y="-9"

   inkscape:window-maximized="1"

   inkscape:current-layer="layer1" />

<path

   style="fill:#ffd42a"

   inkscape:connector-curvature="0"

   id="path3037-8"

   d="m 29.085274,574.97889 c 0,-302.63234 245.793676,-547.973213 548.987136,-547.973213 303.19825,0 548.99289,245.338963 548.99289,547.973213 0,302.6209 -245.79464,547.97121 -548.99289,547.97121 -303.19346,0 -548.987136,-245.3465 -548.987136,-547.97121 z" /><path

   style="fill:#2a7691"

   inkscape:connector-curvature="0"

   id="path3037"

   d="m 56.659032,575.94174 c 0,-287.94145 233.861938,-521.372565 522.337278,-521.372565 288.47987,0 522.34279,233.429305 522.34279,521.372565 0,287.93057 -233.86292,521.37086 -522.34279,521.37086 -288.47534,0 -522.337278,-233.43667 -522.337278,-521.37086 z" /><g

   inkscape:groupmode="layer"

   id="layer1"

   inkscape:label="tridente"

   style="opacity:0.98380567"><g

     id="g3124"

     transform="matrix(0.05931111,0,0,-0.06554201,243.9837,843.19309)"

     style="opacity:0.88356162;fill:#ffffff;stroke:none"><path

       id="path3126"

       d="m 4967,6583 -758,-1716 61,-61 c 34,-34 70,-75 81,-92 226,-332 86,-755 -307,-929 -114,-50 -207,-69 -354,-69 -180,0 -291,29 -440,116 -296,172 -412,516 -269,801 33,65 133,197 149,197 6,0 10,6 10,13 0,15 -1396,3117 -1408,3129 -4,4 -365,-691 -802,-1544 C 369,5334 128,4855 113,4801 44,4567 10,4304 10,4012 c -1,-213 6,-303 40,-552 34,-248 74,-352 184,-480 299,-347 830,-579 2061,-899 149,-38 459,-118 690,-176 1191,-302 1516,-394 1842,-525 l 129,-51 -4,-665 -5,-664 827,0 826,0 1,458 c 1,251 5,551 8,666 l 6,208 85,31 c 47,16 200,72 340,125 559,207 840,293 1728,526 1112,293 1461,405 1817,586 316,160 513,320 609,494 106,191 138,424 138,1011 0,433 -7,499 -73,742 -39,143 -48,165 -301,668 -920,1835 -1241,2466 -1248,2454 -9,-15 -1429,-3066 -1437,-3086 -3,-7 20,-35 50,-63 157,-144 234,-366 193,-560 -64,-302 -354,-525 -710,-546 -439,-26 -818,278 -819,657 0,162 58,300 180,430 l 34,36 -736,1729 c -406,951 -738,1730 -738,1731 -1,1 -343,-771 -760,-1714 z"

       inkscape:connector-curvature="0"

       style="fill:#ffffff" /></g></g>

</svg>
 
 No newline at end of file