From ab211d9064181d9ea8985c5aa01c3a96ef5496ff Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 16 Nov 2023 13:47:28 -0700
Subject: [PATCH] switch to gitlab pages
---
.dockerignore | 14 -------------
.gitlab-ci.yml | 41 ++++++++++++--------------------------
Dockerfile | 54 --------------------------------------------------
3 files changed, 13 insertions(+), 96 deletions(-)
delete mode 100644 .dockerignore
delete mode 100644 Dockerfile
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 9cf14e76..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/.gradle/
-.settings
-bin
-build
-.classpath
-.project
-Scratch*.java
-tmp
-.DS_Store
-.vscode
-.apt_generated*
-.factorypath
-src/resources/fault
-libs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0f870a8..6bf5970a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,34 +188,19 @@ Publish:
- ./gradlew publish -P version=${CI_COMMIT_TAG}
stage: publish
-####
-# Stage: trigger
-####
-
-Trigger CDK nshmp-libs:
+pages:
+ artifacts:
+ paths:
+ - public
needs:
- Build Image
- rules:
- -
- <<: *development-env
- when: manual
- - *staging-env
- - *production-env
+ - Build Project
+ - Markdown Lint
+ - Unit Tests
+ only:
+ # - tags@ghsc/nshmp/nshmp-lib
+ - tags
script:
- - |
- if [ "${ENVIRONMENT}" == 'production' ]; then
- REF="production";
- fi
- - |
- curl --request POST \
- --form token=${NSHMP_CDK_TRIGGER_TOKEN} \
- --form ref=${REF} \
- --form "variables[TRIGGER_DESCRIPTION]=Deploy nshmp-lib to ${ENVIRONMENT}" \
- --form "variables[ENVIRONMENT]=${ENVIRONMENT}" \
- --form "variables[NSHMP_LIB_IMAGE]=${IMAGE_NAME}" \
- --form "variables[SOURCE_PROJECT_NAME]=${CI_PROJECT_NAME}" \
- "https://${PRIVATE_GITLAB}/api/v4/projects/${NSHMP_CDK_PROJECT_ID}/trigger/pipeline"
- stage: trigger
- variables:
- REF: main
- UPSTREAM_PATH: ghsc/nshmp/nshmp-lib
+ - ./gradlew javadocs
+ - mv build/docs/javadoc public
+ stage: publish
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 69d536e2..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-####
-# Deploy nshmp-lib JavDocs in NGINX.
-#
-# Build:
-# docker build <IMAGE_NAME>:<IMAGE_TAG> .
-#
-# Run:
-# docker run -p <PORT>:8080 -d <IMAGE_NAME>:<IMAGE_TAG>
-####
-
-ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
-ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/nginx:latest
-
-##
-# Builder image, compile JavDocs
-##
-FROM ${BUILD_IMAGE} as buildenv
-
-COPY --chown=usgs-user:usgs-user . /app
-WORKDIR /app
-
-USER root
-
-RUN ./gradlew javadoc
-
-USER usgs-user
-
-##
-# Application image, run nshmp-lib JavaDocs in nginx
-##
-FROM ${FROM_IMAGE}
-
-# Set environment variables for use by startup hooks
-ENV BASE_HREF="" \
- DOCUMENT_ROOT="/usr/share/nginx/html" \
- HEALTHCHECK_SCRIPT="/healthcheck.sh" \
- NGINX_CONF_DIR="/etc/nginx/default.d"
-
-USER root
-RUN rm -rf ${DOCUMENT_ROOT}/ && \
- mkdir -p ${DOCUMENT_ROOT}/BASE_HREF && \
- chown usgs-user:usgs-user ${HEALTHCHECK_SCRIPT} && \
- chown -R usgs-user:usgs-user /usr/share/nginx && \
- chown -R usgs-user:usgs-user /etc/nginx
-USER usgs-user
-
-COPY --chown=usgs-user:usgs-user hooks /startup-hooks/
-
-COPY --from=buildenv \
- --chown=usgs-user:usgs-user \
- /app/build/docs/javadoc \
- ${DOCUMENT_ROOT}/BASE_HREF/
-
-WORKDIR /usr/share/nginx
--
GitLab