Compare commits

...

5 commits

5 changed files with 96 additions and 13 deletions

View file

@ -27,6 +27,8 @@ test:
stage: test
image: "$CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID"
script:
- node --version
- npm --version
- python --version
- nikola --version
- pip --version
@ -37,8 +39,9 @@ deploy:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
- docker pull $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID
- docker tag $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:latest
- docker tag $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG:-latest}
- echo "deploying $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG:-latest}"
- docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG:-latest}
include:
- template: Security/SAST.gitlab-ci.yml
- template: Security/Container-Scanning.gitlab-ci.yml

View file

@ -1,6 +1,6 @@
FROM docker.io/library/python:3.11-alpine
RUN apk --no-cache add sshpass openssh-client lftp; mkdir -p /opt/app
RUN apk --no-cache add sshpass openssh-client lftp nodejs npm; mkdir -p /opt/app
WORKDIR /opt/app
ADD requirements.txt /root/
ADD Dockerfile /root/

View file

@ -11,6 +11,16 @@
This image is based on the python:3.11-alpine image and includes additional
Python-packages for building nikola-sites.
## Configure your project
Create a configuration file in your git-repo: `.deployment-helper`
Configuration-Variables:
* DEPLOY_HELPER_ENABLE_NIKOLA (default: true)
* DEPLOY_HELPER_ENABLE_NODE (default: false)
* DEPLOY_HELPER_CONTENT_DIR (default: "website/output")
## lftp for sftp-Uploads
This image includes `lftp` to upload files to a sftp-server and use

View file

@ -1,18 +1,76 @@
#!/bin/sh
if ! test -d website
# Default configurations:
DEPLOY_HELPER_ENABLE_NIKOLA=true
DEPLOY_HELPER_ENABLE_NODE=false
if test -f .deployment-helper
then
echo "Website directory not found"
exit 1
# shellcheck source=/dev/null
. .deployment-helper
fi
if ! command -v nikola >/dev/null 2>&1
if $DEPLOY_HELPER_ENABLE_NODE
then
echo "nikola command not found"
if ! command -v node >/dev/null 2>&1
then
echo "node not found" 1>&2
exit 1
fi
if ! command -v npm >/dev/null 2>&1
then
echo "npm not found" 1>&2
exit 1
fi
if ! test -d node
then
echo "Node directory not found" 1>&2
exit 1
fi
cd node || { echo 'Directory "node" not found'; exit 1;}
if ! npm install
then
echo "Error installing node-dependencies" 1>&2
exit 1
fi
if test -f nuxt.config.ts
then
# Build for nuxi based Sites
if ! npx nuxi build
then
echo "Error nuxi build" 1>&2
exit 1
fi
if ! npx nuxi generate
then
echo "Error nuxi generate" 1>&2
exit 1
fi
else
echo "No supportet node website type found" 1>&2
exit 1
fi
cd ..
fi
cd website
if $DEPLOY_HELPER_ENABLE_NIKOLA
then
if ! test -d website
then
echo "Website directory not found" 1>&2
exit 1
fi
nikola build
if ! command -v nikola >/dev/null 2>&1
then
echo "nikola command not found" 1>&2
exit 1
fi
cd website || { echo 'Directory "website" not found'; exit 1;}
nikola build
cd ..
fi
exit "$?"

View file

@ -1,7 +1,16 @@
#!/bin/sh
# Default configurations:
DEPLOY_HELPER_CONTENT_DIR="website/output"
if ! test -d website/output
if test -f .deployment-helper
then
# shellcheck source=/dev/null
. .deployment-helper
fi
if ! test -d "${DEPLOY_HELPER_CONTENT_DIR}"
then
echo "Website-Build not found"
exit 1
@ -16,6 +25,9 @@ then
fi
lftp -e 'set sftp:auto-confirm yes; mirror -R ./website/output/ ./web/; bye' --env-password -u ${SSH_USER} sftp://${SSH_HOST}
lftp -e "set sftp:auto-confirm yes; mirror -R ${DEPLOY_HELPER_CONTENT_DIR} ./web/; bye" \
--env-password \
-u ${SSH_USER} \
sftp://${SSH_HOST}