From e1d56d71b55043afecea51fe9a11fb3a25aa6d50 Mon Sep 17 00:00:00 2001 From: Software Shinobi Date: Wed, 28 May 2025 21:40:56 -0400 Subject: [PATCH] automated terminal push --- Jenkinsfile | 54 +++++++++++++++++++++++++++ compose.bash | 1 + compose.yaml | 4 +- landing/Dockerfile | 2 +- server/Dockerfile | 4 +- server/provision/.provision.bash.swp | Bin 0 -> 12288 bytes server/provision/provision.bash | 6 +-- 7 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 Jenkinsfile create mode 100644 server/provision/.provision.bash.swp 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 0000000000000000000000000000000000000000..8832f1000f8ef47143c30fdc95e55908d2be7fe0 GIT binary patch literal 12288 zcmeI2O^X~w7{_ZpYTnRO0>U#h#9W;2-OVf;6Np4|@emSq^{CcV*Gw1N-PKf8?_?5* zpCKS9h~mp9h=Lb&qdAN5evq#tm#}=4PRiTH{{hTI-F(m^u`?ZLodG;oxiU0z!BEAMqX z^u*&YA4Umb&A~u05DWwZ!9Xw&3QBj5iQa!#m$E>oep7ji_9k>4qls3RxB9*(#pyT#V#*n{CwVZFV(q>X9dEuFenOkMhQoyG`X_A z64;V1$Uoe~EeWN;YJ)o&t;;FJyTU|R5C+QE6J;LUR4?O9JM8)Pe1_g2k(S)rNxh&7 zPI!Xpo1FT|?m*PH6c1Gq`?6%}SG2S^Sf(}*EYAD3E&Xxx#KE!J7MWa1v`+Tt$A-$O;Dyf|pJ%!yO_y3t%Y$ffFi+muv->(D*ZsH3QQs@8KePii z_6bMoTxrk8@dGN^y)1-yPL8yZG}RT2_0z~MDb~qIo)E|G771bBhM69B+UI>#TPeqf znIv?jLQaNC+Q_5n# BwVVI| literal 0 HcmV?d00001 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