Compare commits
No commits in common. "master" and "redesign/v2" have entirely different histories.
master
...
redesign/v
|
|
@ -1,2 +0,0 @@
|
|||
FROM jitesoft/lighttpd:latest
|
||||
COPY ./site /var/www/html
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
pipeline {
|
||||
agent any
|
||||
|
||||
environment {
|
||||
DOCKER_REGISTRY = "docker.nclazz.de"
|
||||
DOCKER_GROUP = 'nclazz'
|
||||
DOCKER_IMAGE = 'site'
|
||||
DOCKER_TAG = 'latest'
|
||||
|
||||
DEPLOY_NODE = "${ BRANCH_NAME == "master" ? "swarm && prod" : "swarm && staging" }"
|
||||
SERVICE_NAME = 'marrone-international'
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Run Docker Build') {
|
||||
agent { label 'docker' }
|
||||
steps {
|
||||
sh 'chmod +x version.sh'
|
||||
sh './version.sh > site/version.json'
|
||||
script {
|
||||
docker.withRegistry("https://$DOCKER_REGISTRY", "jenkins_nexus") {
|
||||
def image = docker.build("nclazz/site")
|
||||
image.push("${env.DOCKER_TAG}")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Run Deployment') {
|
||||
agent { label "provision" }
|
||||
when {
|
||||
branch 'master'
|
||||
}
|
||||
steps {
|
||||
deployToSwarm(
|
||||
name: 'www-nclazz',
|
||||
file: "${env.WORKSPACE}/docker-compose.yml",
|
||||
forceUpdate: true,
|
||||
askApproval: false,
|
||||
slackChannel: 'deployment'
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
always {
|
||||
cleanWs()
|
||||
}
|
||||
failure {
|
||||
slackSend(
|
||||
channel: 'notifications',
|
||||
color: 'danger',
|
||||
message: "There is a *build failure* in ${env.JOB_NAME}.\nBuild: ${env.BUILD_URL} "
|
||||
)
|
||||
}
|
||||
unstable {
|
||||
slackSend(
|
||||
channel: 'notifications',
|
||||
color: 'warning',
|
||||
message: "Some tests have failed in ${env.JOB_NAME}.\nBuild: ${env.BUILD_URL} "
|
||||
)
|
||||
}
|
||||
fixed {
|
||||
slackSend(
|
||||
channel: 'notifications',
|
||||
color: 'good',
|
||||
message: "The build ${env.JOB_NAME} completed successfully and is back to normal.\nBuild: ${env.BUILD_URL} "
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
version: '3.8'
|
||||
services:
|
||||
site:
|
||||
deploy:
|
||||
replicas: 2
|
||||
placement:
|
||||
max_replicas_per_node: 1
|
||||
image: docker.nclazz.de/nclazz/site:latest
|
||||
ports:
|
||||
- 9082:80
|
||||
|
Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 236 B |
|
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 291 B |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
|
@ -0,0 +1,69 @@
|
|||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset='utf-8'>
|
||||
<title>nclazz : : coding</title>
|
||||
<meta name='viewport' content='width=device-width, initial-scale=1'>
|
||||
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,700;0,900;1,300&display=swap" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Overpass+Mono&display=swap" rel="stylesheet">
|
||||
|
||||
<link rel="stylesheet" href="styles/theme.css">
|
||||
<link rel="stylesheet" href="styles/main.css">
|
||||
|
||||
<link rel="icon" href="favicon.ico?v=1" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="favicon.ico?v=1" type="image/x-icon" />
|
||||
|
||||
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<img src="img/logo_light.png" alt="nclazz logo">
|
||||
</header>
|
||||
<nav>
|
||||
<ul>
|
||||
<li class="entry"><a href="#">about-me <b class="attribute">msg=<i>"Who am I?"</i></b></a></li>
|
||||
<li class="entry"><a href="#">skills-and-services <b class="attribute">msg=<i>"What do i offer?"</i></b></a></li>
|
||||
<li>
|
||||
<ul>
|
||||
<li class="entry">sub</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="entry"><a href="#">contact-me <b class="attribute">msg=<i>"Get in touch with me!"</i></b></a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
<main>
|
||||
<section>
|
||||
<h1>About me</h1>
|
||||
<article>
|
||||
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. </p><br>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. </p><br>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
|
||||
</article>
|
||||
</section>
|
||||
<section>
|
||||
<h1>About me</h1>
|
||||
<article>
|
||||
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. </p><br>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. </p><br>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
|
||||
</article>
|
||||
</section>
|
||||
</main>
|
||||
<footer>
|
||||
<ul>
|
||||
<li><a href="#">Impressum</a></li>
|
||||
<li><a href="#">Datenschutz</a></li>
|
||||
<li><a href="#">AGB</a></li>
|
||||
</ul>
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset='utf-8'>
|
||||
<title>nclazz : : coding</title>
|
||||
<meta name='viewport' content='width=device-width, initial-scale=1'>
|
||||
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,700;0,900;1,300&display=swap" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Overpass+Mono&display=swap" rel="stylesheet">
|
||||
|
||||
<link rel="stylesheet" href="styles/theme.css">
|
||||
<link rel="stylesheet" href="styles/main.css">
|
||||
|
||||
<link rel="icon" href="favicon.ico?v=1" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="favicon.ico?v=1" type="image/x-icon" />
|
||||
|
||||
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<img src="img/logo_light.png" alt="nclazz logo">
|
||||
</header>
|
||||
<nav class="fhw-slide">
|
||||
<ul>
|
||||
<li class="entry"><a href="#en">english</a></li>
|
||||
<li class="entry"><a href="#de">deutsch</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
<main>
|
||||
<section id="en" class="fhw-slide">
|
||||
<h1>Welcome at the construction site!</h1>
|
||||
<article>
|
||||
<p> You will find information about me and my work as a software developer here soon.
|
||||
Going-Live is planned to be on <b>18th February 2022</b>
|
||||
</p><br><br>
|
||||
<p style="font-size: 1.3em; padding-left: 2em"><i>Until then i wish everyone who stumbled upon this site <b>all the best and good health</b> in these tough times!</i>
|
||||
<br><br>
|
||||
Niclas Thobaben
|
||||
</p><br><br>
|
||||
<p>You want to contact me? Just write me at <a href="mailto:info@nclazz.de">info@nclazz.de</a></p>
|
||||
</article>
|
||||
</section>
|
||||
<section id="de" class="fhw-slide">
|
||||
<h1>Wilkommen auf der Baustelle!</h1>
|
||||
<article>
|
||||
<p>In Kürze finden Sie hier Informationen über mich und meine Arbeit als Software Entwickler.
|
||||
Geplanter Start der Website ist am <b>18. Februar 2022</b>.
|
||||
</p><br><br>
|
||||
<p style="font-size: 1.3em; padding-left: 2em"><i>Bis dahin wünsche ich allen, die auf diese Seite gestoßen sind alles <b>Gute und Gesundheit</b> in diesen schweren Zeiten!</i>
|
||||
<br><br>
|
||||
Niclas Thobaben
|
||||
</p><br><br>
|
||||
<p>Möchten Sie Kontakt zu mir aufnehmen? Schreiben Sie mir unter <a href="mailto:info@nclazz.de">info@nclazz.de</a></p>
|
||||
</article>
|
||||
</section>
|
||||
</main>
|
||||
<!-- <footer>
|
||||
<ul>
|
||||
<li><a href="#">Impressum</a></li>
|
||||
<li><a href="#">Datenschutz</a></li>
|
||||
<li><a href="#">AGB</a></li>
|
||||
</ul>
|
||||
</footer> -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -19,13 +19,10 @@ html {
|
|||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#20242c",endColorstr="#000000",GradientType=1);
|
||||
background-repeat: no-repeat;
|
||||
background-color: var(--color-bg);
|
||||
scroll-behavior: smooth;
|
||||
|
||||
}
|
||||
|
||||
a {
|
||||
color: var(--color-primary-1);
|
||||
}
|
||||
|
||||
|
||||
body {
|
||||
flex: 1;
|
||||
|
|
@ -44,7 +41,7 @@ body > * {
|
|||
|
||||
header {
|
||||
grid-column-end: span 2;
|
||||
padding: 4em 3em;
|
||||
padding: 4em 8em;
|
||||
}
|
||||
|
||||
header img {
|
||||
|
|
@ -57,7 +54,7 @@ nav {
|
|||
line-height: 1.5em;
|
||||
cursor: pointer;
|
||||
font-size: 1em;
|
||||
padding: 1em 3em;
|
||||
padding: 1em 8em;
|
||||
}
|
||||
|
||||
nav ul {
|
||||
|
|
@ -120,14 +117,14 @@ main {
|
|||
justify-content: stretch;
|
||||
align-content: stretch;
|
||||
flex-wrap: wrap;
|
||||
padding: 1em 3em;
|
||||
padding: 1em 8em;
|
||||
}
|
||||
|
||||
/* main > * {
|
||||
main > * {
|
||||
flex: 1;
|
||||
min-width: 40vw;
|
||||
padding: 2em 2em 0 0;
|
||||
} */
|
||||
}
|
||||
|
||||
main h1 {
|
||||
color: var(--color-primary-2);
|
||||
|
|
@ -179,13 +176,4 @@ footer li a {
|
|||
|
||||
footer li a:hover {
|
||||
color: var(--color-nav-fg-hover);
|
||||
}
|
||||
/*
|
||||
.fhw-slide {
|
||||
height: 100vh;
|
||||
box-sizing: border-box;
|
||||
} */
|
||||
|
||||
section {
|
||||
padding-bottom: 8em;
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#!/bin/bash
|
||||
echo "{ \"commit\": \"$GIT_COMMIT\", \"build\": \"$BUILD_ID\" }"
|
||||
Loading…
Reference in New Issue