diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..1989729 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,54 @@ +pipeline { + + agent none + + options { + + disableConcurrentBuilds(abortPrevious: true) + + buildDiscarder(logRotator(numToKeepStr: '10')) + } + + stages { + + stage('docker compose build') { + + agent { + + label "sian" + + } + + steps { + + dir('.') { + + sh 'docker compose build' + + } + + } + + } + + stage('docker compose push') { + + agent { + + label "sian" + + } + + steps { + + dir('.') { + + sh 'docker compose push' + + } + + } + + } + +}} diff --git a/compose.bash b/compose.bash index fa8be91..baeca42 100755 --- a/compose.bash +++ b/compose.bash @@ -11,3 +11,4 @@ set -x; docker compose down --remove-orphans docker compose up --build -d + diff --git a/compose.yaml b/compose.yaml index 5846159..bf04041 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,4 +1,3 @@ - services: linux.softwareshinobi.com-server: @@ -35,4 +34,5 @@ services: ports: - - 2280:80 + - "2280:80" + diff --git a/landing/Dockerfile b/landing/Dockerfile index a40ebfe..d20bdd9 100644 --- a/landing/Dockerfile +++ b/landing/Dockerfile @@ -6,7 +6,7 @@ RUN pip install mkdocs-blog-plugin WORKDIR /docs -COPY . . +COPY . . RUN mkdocs build diff --git a/server/Dockerfile b/server/Dockerfile index 8891d79..6a7e3b5 100755 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:noble +FROM ubuntu:questing ## @@ -6,7 +6,7 @@ WORKDIR / COPY /provision / -## +## ARG DEBIAN_FRONTEND=noninteractive diff --git a/server/provision/.provision.bash.swp b/server/provision/.provision.bash.swp new file mode 100644 index 0000000..8832f10 Binary files /dev/null and b/server/provision/.provision.bash.swp differ diff --git a/server/provision/provision.bash b/server/provision/provision.bash index 7daa097..86c2f81 100755 --- a/server/provision/provision.bash +++ b/server/provision/provision.bash @@ -1,7 +1,7 @@ #!/bin/bash ## -## This script installs stuff +## This script installs stuff ## to set up a linux server ## suitable for newbies. ## @@ -15,7 +15,7 @@ set -e; set -x; -## +## cat /etc/issue; @@ -45,7 +45,7 @@ apt install -y vim nano; ## apt install -y hollywood; -apt install -y cmatrix; +apt install -y cmatrix cmatrix-xfont; ## ## shinobi academy user config