Compare commits
36 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 41c01fcf55 | |||
| ea61606f68 | |||
| e350bba979 | |||
| 6dc13a5c1e | |||
| a20db4d400 | |||
| de6b32b21e | |||
| f3725f605d | |||
| 7c7cc7130e | |||
| e57719d4f6 | |||
| ff6f212c83 | |||
| 122e341c89 | |||
| 39b848b126 | |||
| 0b367bba27 | |||
| f02b11b418 | |||
| d23375e28b | |||
| dcf2cfb35d | |||
| dd0b5f63fe | |||
| eb0b249d6a | |||
| 8cbaef9afe | |||
| 995eb69937 | |||
| 193dcb2b2b | |||
| d42c59c317 | |||
| 2b5b791399 | |||
| f99105c222 | |||
| ca716de215 | |||
| 7f93e1c58a | |||
| 0f12fd3742 | |||
| 91cefa9033 | |||
| 2f86d84e19 | |||
| dc461f6af0 | |||
| 8b2d332d8b | |||
| 00804e0a30 | |||
| 4b8cac97ad | |||
| 8af19f442c | |||
| 62212f1c7c | |||
| 8751d5aa86 |
Vendored
+35
-4
@@ -1,22 +1,53 @@
|
||||
pipeline {
|
||||
agent any
|
||||
agent none
|
||||
stages {
|
||||
stage('Checkout') {
|
||||
agent { label 'agent-12' }
|
||||
when { expression { return env.GIT_BRANCH == 'origin/main' } }
|
||||
steps {
|
||||
checkout scm
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
agent { label 'agent-12' }
|
||||
when { expression { return env.GIT_BRANCH == 'origin/main' } }
|
||||
steps {
|
||||
script {
|
||||
docker.build('trianta.dev:latest')
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Deploy') {
|
||||
agent { label 'agent-12' }
|
||||
when { expression { return env.GIT_BRANCH == 'origin/main' } }
|
||||
steps {
|
||||
sh 'docker stop trianta.dev && docker rm trianta.dev || exit 0'
|
||||
sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name trianta.dev trianta.dev:latest'
|
||||
}
|
||||
}
|
||||
stage('Test Checkout') {
|
||||
agent { label 'agent-13' }
|
||||
when { expression { return env.GIT_BRANCH != 'origin/main' } }
|
||||
steps {
|
||||
sh 'echo $GIT_BRANCH'
|
||||
checkout scm
|
||||
}
|
||||
}
|
||||
stage('Test Build') {
|
||||
agent { label 'agent-13' }
|
||||
when { expression { return env.GIT_BRANCH != 'origin/main' } }
|
||||
steps {
|
||||
script {
|
||||
docker.build('test.trianta.dev:latest')
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Deploy') {
|
||||
stage('Test Deploy') {
|
||||
agent { label 'agent-13' }
|
||||
when { expression { return env.GIT_BRANCH != 'origin/main' } }
|
||||
steps {
|
||||
sh 'docker stop test && docker rm test || exit 0'
|
||||
sh 'docker run -d -p 3466:80 --name test test.trianta.dev:latest'
|
||||
sh 'docker stop test.trianta.dev && docker rm test.trianta.dev || exit 0'
|
||||
sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name test.trianta.dev test.trianta.dev:latest'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+17
-20
@@ -1,14 +1,16 @@
|
||||
/*
|
||||
* base text: #06CDFF
|
||||
* important text: #8200FF
|
||||
* background: #03001C
|
||||
* text / border: #8c7862
|
||||
* foreground: #89bea6
|
||||
* background: #61937c
|
||||
*/
|
||||
|
||||
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
font-weight: 800;
|
||||
color: #06CDFF;
|
||||
background: #03001C;
|
||||
font-family: "Departure Mono", sans-serif;
|
||||
font-optical-sizing: auto;
|
||||
font-weight: 400;
|
||||
color: #8c7862;
|
||||
background: #61937c;
|
||||
line-height: 1.5;
|
||||
margin-inline: auto;
|
||||
margin: 0 auto;
|
||||
@@ -18,6 +20,8 @@ body {
|
||||
max-width: 60rem;
|
||||
margin: 0 auto;
|
||||
padding: 2rem 1.5rem;
|
||||
background: #89bea6;
|
||||
border: 4px solid #8c7862;
|
||||
}
|
||||
|
||||
nav {
|
||||
@@ -51,11 +55,8 @@ nav ul {
|
||||
}
|
||||
|
||||
.trianta {
|
||||
border: none !important;
|
||||
color: #06CDFF !important;
|
||||
font-size: 2.5rem !important;
|
||||
min-width: 12rem;
|
||||
margin: -1rem;
|
||||
}
|
||||
|
||||
.canvas {
|
||||
@@ -63,13 +64,12 @@ nav ul {
|
||||
display: inline-block;
|
||||
width: 60rem;
|
||||
vertical-align: bottom;
|
||||
border: solid 4px #06CDFF;
|
||||
border: solid 4px #8c7862;
|
||||
}
|
||||
|
||||
.stats {
|
||||
font-size: 18px;
|
||||
display: inline-block;
|
||||
width: 12rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ h1 {
|
||||
}
|
||||
|
||||
h2 {
|
||||
border: solid 2px #06CDFF;
|
||||
border: solid 2px #8c7862;
|
||||
margin: auto;
|
||||
padding: 8px;
|
||||
text-align: center;
|
||||
@@ -94,14 +94,12 @@ h3 {
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0px;
|
||||
margin: 1rem;
|
||||
}
|
||||
|
||||
a {
|
||||
background-color: #03001C;
|
||||
border: solid 2px #06CDFF;
|
||||
border: solid 2px #8c7862;
|
||||
border-radius: 12px;
|
||||
color: #06CDFF;
|
||||
display: inline-block;
|
||||
margin: 6px;
|
||||
margin-top: 0px;
|
||||
@@ -126,8 +124,7 @@ a.button {
|
||||
}
|
||||
|
||||
a:visited {
|
||||
border: solid 2px #8200FF;
|
||||
color: #8200FF;
|
||||
color: #8c7862;
|
||||
}
|
||||
|
||||
@keyframes hover {
|
||||
@@ -157,5 +154,5 @@ a:visited {
|
||||
|
||||
#pong {
|
||||
margin: 6px;
|
||||
background: #03001C;
|
||||
background: #61937c;
|
||||
}
|
||||
|
||||
+14
-15
@@ -3,25 +3,24 @@
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<title>Trianta</title>
|
||||
<link rel="stylesheet" href="/default.css" />
|
||||
<link rel="stylesheet" href="/default.css">
|
||||
<link rel="stylesheet" href="https://www.nerdfonts.com/assets/css/webfont.css">
|
||||
</head>
|
||||
<body>
|
||||
<div class="inside">
|
||||
<div>
|
||||
<a href="/" class="trianta">TRIANTA</a>
|
||||
<p>Function over form by design</p>
|
||||
</div>
|
||||
<div style="display: flex;">
|
||||
<nav class="column">
|
||||
<ul>
|
||||
<li><a href="https://www.github.com/trimutex">GitHub</a></li>
|
||||
<li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
|
||||
<li><a href="/completed">Completed</a></li>
|
||||
<li><a href="/current">Current</a></li>
|
||||
<li><a href="/other">Other</a></li>
|
||||
<li><a href="/contact">Contact</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
<a href="/" class="trianta">TRIANTA</a>
|
||||
<div class="column">
|
||||
<a href="https://www.github.com/trimutex" alt="GitHub"><i class="nf nf-dev-github"></i></a>
|
||||
<a href="https://lab.trianta.dev/Trianta" alt="Personal Projects"><i class="nf nf-linux-gitea"></i></a>
|
||||
<a href="/completed" alt="Completed"><i class="nf nf-dev-javascript"></i></a>
|
||||
<a href="/current" alt="Current"><i class="nf nf-dev-git_branch"></i></a>
|
||||
<a href="/other" alt="Other"><i class="nf nf-dev-git_merge"></i></a>
|
||||
<a href="/contact" alt="Contact"><i class="nf nf-oct-feed_person"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
<p>Function over form by design</p>
|
||||
<div style="display: flex;">
|
||||
<div class="column gap"></div>
|
||||
<div class="column content"></div>
|
||||
</div>
|
||||
|
||||
Generated
+3
-3
@@ -13,9 +13,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/typescript": {
|
||||
"version": "5.6.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
|
||||
"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
|
||||
"version": "5.9.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
|
||||
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
"tsc": "bin/tsc",
|
||||
|
||||
@@ -25,8 +25,9 @@
|
||||
<div class="column gap"></div>
|
||||
<div class="column content">
|
||||
<h2>Contact Methods</h2>
|
||||
<p>E-mail: gregcraw2001@gmail.com</p>
|
||||
<p>E-mail: gregcraw2001@gmail.com</p>
|
||||
<p>Discord: trianta</p>
|
||||
<p>Matrix: @trimutex:matrix.org</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user