s6 for all archs, remove cruft

This commit is contained in:
Jamie Curnow
2021-06-30 15:11:24 +10:00
parent d44143b15a
commit 28a2b4cbc4
9 changed files with 44 additions and 432 deletions

View File

@@ -44,15 +44,21 @@ ENV S6_FIX_ATTRS_HIDDEN=1
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
# s6 overlay
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64.tar.gz" \
&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
COPY scripts/install-s6 /tmp/install-s6
RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -rf /tmp/*
EXPOSE 80/tcp 81/tcp 443/tcp
COPY docker/rootfs /
# Remove frontend service not required for prod, dev nginx config as well
RUN rm -rf /etc/services.d/frontend /etc/nginx/conf.d/dev.conf
# and remove any other cruft
RUN rm -rf /etc/services.d/frontend \
/etc/nginx/conf.d/dev.conf \
/var/cache/* \
/var/log/* \
/tmp/* \
/var/lib/dpkg/status-old
VOLUME /data

Binary file not shown.

Before

Width:  |  Height:  |  Size: 820 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -1,30 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Site not found :: Nginx Proxy Manager</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="main.css">
</head>
<body>
<div class="bg-img1 size1 overlay1 p-t-24" style="background-image: url('images/bg.jpg');">
<div class="flex-w flex-sb-m p-l-80 p-r-74 p-b-175 respon5">
<div class="wrappic1 m-r-30 m-t-10 m-b-10">
<a href="#"><img src="images/logo.png" alt="Logo" class="logo-img"></a>
</div>
<div class="flex-w m-t-10 m-b-10">
<a href="https://github.com/jc21/nginx-proxy-manager" class="size3 flex-c-m how-social trans-04 m-r-6" title="Nginx Proxy Manager on Github"><i class="fa fa-github"></i></a>
<a href="https://nginxproxymanager.jc21.com" class="size3 flex-c-m how-social trans-04 m-r-6" title="Nginx Proxy Manager Website"><i class="fa fa-globe"></i></a>
</div>
</div>
<div class="flex-w flex-sa p-r-200 respon1">
<div class="p-t-34 p-b-60 respon3">
<p class="l1-txt1 p-b-10 respon2">This site is</p>
<h3 class="l1-txt2 p-b-45 respon2 respon4">not yet configured</h3>
</div>
</div>
</div>
</body>
</html>

View File

@@ -1,399 +0,0 @@
*, *:before, *:after {
margin: 0px;
padding: 0px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
body, html {
font-family: Arial, sans-serif;
font-size: 15px;
color: #666666;
height: 100%;
background-color: #fff;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
a:focus {outline: none;}
a:hover {text-decoration: none;}
h1,h2,h3,h4,h5,h6,p {margin: 0px;}
ul, li {
margin: 0px;
list-style-type: none;
}
.logo-img {
border: 2px solid #3c99b9;
border-radius: 50%;
}
.p-t-24 {padding-top: 24px;}
.p-t-34 {padding-top: 34px;}
.p-b-10 {padding-bottom: 10px;}
.p-b-45 {padding-bottom: 45px;}
.p-b-60 {padding-bottom: 60px;}
.p-b-175 {padding-bottom: 175px;}
.p-l-80 {padding-left: 80px;}
.p-r-74 {padding-right: 74px;}
.p-r-200 {padding-right: 200px;}
.m-t-10 {margin-top: 10px;}
.m-b-10 {margin-bottom: 10px;}
.m-r-6 {margin-right: 6px;}
.m-r-30 {margin-right: 30px;}
.bo-cir {border-radius: 50%;}
.of-hidden {overflow: hidden;}
.visible-false {visibility: hidden;}
.visible-true {visibility: visible;}
.trans-04 {
-webkit-transition: all 0.4s;
-o-transition: all 0.4s;
-moz-transition: all 0.4s;
transition: all 0.4s;
}
.flex-w,
.flex-sa,
.flex-c-m,
.flex-sb-m,
.dis-flex {
display: -webkit-box;
display: -webkit-flex;
display: -moz-box;
display: -ms-flexbox;
display: flex;
}
.flex-w {
-webkit-flex-wrap: wrap;
-moz-flex-wrap: wrap;
-ms-flex-wrap: wrap;
-o-flex-wrap: wrap;
flex-wrap: wrap;
}
.flex-sa {
justify-content: space-around;
}
.flex-c-m {
justify-content: center;
-ms-align-items: center;
align-items: center;
}
.flex-sb-m {
justify-content: space-between;
-ms-align-items: center;
align-items: center;
}
.flex-row {
-webkit-flex-direction: row;
-moz-flex-direction: row;
-ms-flex-direction: row;
-o-flex-direction: row;
flex-direction: row;
}
@font-face {
font-family: Poppins-Regular;
src: url('fonts/Poppins-Regular.ttf');
}
@font-face {
font-family: Poppins-Bold;
src: url('fonts/Poppins-Bold.ttf');
}
@font-face {
font-family: Aldrich-Regular;
src: url('fonts/Aldrich-Regular.ttf');
}
.container {max-width: 1200px;}
.cl0 {color: #fff;}
.s1-txt1 {
font-family: Poppins-Bold;
font-size: 15px;
color: #555;
line-height: 1.2;
}
.s1-txt2 {
font-family: Poppins-Bold;
font-size: 15px;
color: #fff;
line-height: 1.2;
}
.s1-txt3 {
font-family: Poppins-Regular;
font-size: 13px;
color: #999;
line-height: 1.5;
}
.l1-txt1 {
font-family: Poppins-Regular;
font-size: 30px;
color: #fff;
line-height: 1.2;
text-transform: uppercase;
}
.l1-txt2 {
font-family: Poppins-Bold;
font-size: 70px;
color: #fff;
line-height: 1.1;
text-transform: uppercase;
}
.l1-txt3 {
font-family: Poppins-Bold;
font-size: 30px;
color: #333;
line-height: 1.2;
text-transform: uppercase;
}
.size1 {
width: 100%;
min-height: 100vh;
}
.size2 {
width: 100%;
height: 50px;
}
.size3 {
width: 36px;
height: 36px;
}
.wsize1 {
width: 390px;
max-width: 100%;
}
.bg0 {background-color: #fff;}
.bg-img1 {
background-position: center;
background-repeat: no-repeat;
background-size: cover;
}
.bor1 {
border-radius: 10px;
}
.overlay1 {
position: relative;
z-index: 1;
}
.overlay1::before {
content: "";
display: block;
position: absolute;
z-index: -1;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: #30bab6;
background: -webkit-linear-gradient(top, #00B4DB, #240b36);
background: -o-linear-gradient(top, #00B4DB, #240b36);
background: -moz-linear-gradient(top, #00B4DB, #240b36);
background: linear-gradient(top, #00B4DB, #240b36);
opacity: 0.8;
}
.how-btn1 {
border-radius: 25px;
background-color: #240b36;
padding-right: 20px;
padding-left: 20px;
}
.how-btn1:hover {
background-color: #333333;
}
.wrappic1 {
display: block;
flex-grow: 1;
}
.wrappic1 img {
max-width: 100%;
}
.how-social {
color: #fff;
font-size: 22px;
background-color: transparent;
border: 2px solid #fff;
border-radius: 2px;
}
.how-social:hover {
background-color: #240b36;
color: #fff;
}
.focus-in0:focus::-webkit-input-placeholder { color:transparent; }
.focus-in0:focus:-moz-placeholder { color:transparent; }
.focus-in0:focus::-moz-placeholder { color:transparent; }
.focus-in0:focus:-ms-input-placeholder { color:transparent; }
.hov-cl0:hover {color: #fff;}
.hov-bg0:hover {background-color: #fff;}
@media (max-width: 1400px) {
.respon1 {
padding: 15px;
}
}
@media (max-width: 1200px) {
.m-0-xl {margin: 0;}
.m-lr-0-xl {margin-left: 0; margin-right: 0;}
.m-lr-15-xl {margin-left: 15px; margin-right: 15px;}
.m-l-0-xl {margin-left: 0;}
.m-r-0-xl {margin-right: 0;}
.m-l-15-xl {margin-left: 15px;}
.m-r-15-xl {margin-right: 15px;}
.p-0-xl {padding: 0;}
.p-lr-0-xl {padding-left: 0; padding-right: 0;}
.p-lr-15-xl {padding-left: 15px; padding-right: 15px;}
.p-l-0-xl {padding-left: 0;}
.p-r-0-xl {padding-right: 0;}
.p-l-15-xl {padding-left: 15px;}
.p-r-15-xl {padding-right: 15px;}
.w-full-xl {width: 100%;}
.respon1 {
flex-direction: column;
align-items: center;
}
.respon2 {
text-align: center;
}
.respon3 {
display: -webkit-box;
display: -webkit-flex;
display: -moz-box;
display: -ms-flexbox;
display: flex;
flex-direction: column;
align-items: center;
}
}
@media (max-width: 992px) {
.m-0-lg {margin: 0;}
.m-lr-0-lg {margin-left: 0; margin-right: 0;}
.m-lr-15-lg {margin-left: 15px; margin-right: 15px;}
.m-l-0-lg {margin-left: 0;}
.m-r-0-lg {margin-right: 0;}
.m-l-15-lg {margin-left: 15px;}
.m-r-15-lg {margin-right: 15px;}
.p-0-lg {padding: 0;}
.p-lr-0-lg {padding-left: 0; padding-right: 0;}
.p-lr-15-lg {padding-left: 15px; padding-right: 15px;}
.p-l-0-lg {padding-left: 0;}
.p-r-0-lg{padding-right: 0;}
.p-l-15-lg {padding-left: 15px;}
.p-r-15-lg {padding-right: 15px;}
.w-full-lg {width: 100%;}
}
@media (max-width: 768px) {
.m-0-md {margin: 0;}
.m-lr-0-md {margin-left: 0; margin-right: 0;}
.m-lr-15-md {margin-left: 15px; margin-right: 15px;}
.m-l-0-md {margin-left: 0;}
.m-r-0-md {margin-right: 0;}
.m-l-15-md {margin-left: 15px;}
.m-r-15-md {margin-right: 15px;}
.p-0-md {padding: 0;}
.p-lr-0-md {padding-left: 0; padding-right: 0;}
.p-lr-15-md {padding-left: 15px; padding-right: 15px;}
.p-l-0-md {padding-left: 0;}
.p-r-0-md{padding-right: 0;}
.p-l-15-md {padding-left: 15px;}
.p-r-15-md {padding-right: 15px;}
.w-full-md {width: 100%;}
}
@media (max-width: 576px) {
.m-0-sm {margin: 0;}
.m-lr-0-sm {margin-left: 0; margin-right: 0;}
.m-lr-15-sm {margin-left: 15px; margin-right: 15px;}
.m-l-0-sm {margin-left: 0;}
.m-r-0-sm {margin-right: 0;}
.m-l-15-sm {margin-left: 15px;}
.m-r-15-sm {margin-right: 15px;}
.p-0-sm {padding: 0;}
.p-lr-0-sm {padding-left: 0; padding-right: 0;}
.p-lr-15-sm {padding-left: 15px; padding-right: 15px;}
.p-l-0-sm {padding-left: 0;}
.p-r-0-sm{padding-right: 0;}
.p-l-15-sm {padding-left: 15px;}
.p-r-15-sm {padding-right: 15px;}
.w-full-sm {width: 100%;}
.respon4 {
font-size: 50px;
}
.respon5 {
padding-left: 20px;
padding-right: 14px;
padding-bottom: 50px;
}
}
@media (max-width: 480px) {
.m-0-ssm {margin: 0;}
.m-lr-0-ssm {margin-left: 0; margin-right: 0;}
.m-lr-15-ssm {margin-left: 15px; margin-right: 15px;}
.m-l-0-ssm {margin-left: 0;}
.m-r-0-ssm {margin-right: 0;}
.m-l-15-ssm {margin-left: 15px;}
.m-r-15-ssm {margin-right: 15px;}
.p-0-ssm {padding: 0;}
.p-lr-0-ssm {padding-left: 0; padding-right: 0;}
.p-lr-15-ssm {padding-left: 15px; padding-right: 15px;}
.p-l-0-ssm {padding-left: 0;}
.p-r-0-ssm{padding-right: 0;}
.p-l-15-ssm {padding-left: 15px;}
.p-r-15-ssm {padding-right: 15px;}
.w-full-ssm {width: 100%;}
}