Skip to content
Permalink
Browse files

Small adjustements to the container

  • Loading branch information...
nrobinaubertin committed Mar 7, 2019
1 parent 85058a3 commit c5359a8151501e288bbcbea4455257a42212ed50
Showing with 29 additions and 25 deletions.
  1. +3 −5 .dockerignore
  2. +1 −1 Dockerfile
  3. +0 −1 api/src/Command/PreparePreviewsCommand.php
  4. +14 −14 app/src/scss/_root.scss
  5. +6 −2 docker/zusam/nginx/nginx.conf
  6. +5 −2 docker/zusam/run.sh
@@ -22,13 +22,11 @@

# APP
/app/.cache
/app/bootstrap-light/node_modules
/app/node_modules
/app/node_modules/
/app/yarn-error.log
/app/yarn.lock

# PUBLIC
/public/api/bundles/
/public/files/
/public/thumbnails/
/public/api/bundles
/public/files
/public/thumbnails
@@ -4,7 +4,7 @@ FROM alpine:3.9
RUN apk add --no-cache -U su-exec tini s6
ENTRYPOINT ["/sbin/tini", "--"]

# Lang of the webapp
# Default lang of the webapp
ARG LANG="en"

# global environment variables
@@ -70,7 +70,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
exit(0);
}
$k++;
echo "[$k/".count($messages)."]: ".$i["id"]."\n";
// get first url data
@@ -1,19 +1,19 @@
:root {
// Custom variable values only support SassScript inside `#{}`.
@each $color, $value in $colors {
--#{$color}: #{$value};
}
// Custom variable values only support SassScript inside `#{}`.
@each $color, $value in $colors {
--#{$color}: #{$value};
}

@each $color, $value in $theme-colors {
--#{$color}: #{$value};
}
@each $color, $value in $theme-colors {
--#{$color}: #{$value};
}

@each $bp, $value in $grid-breakpoints {
--breakpoint-#{$bp}: #{$value};
}
@each $bp, $value in $grid-breakpoints {
--breakpoint-#{$bp}: #{$value};
}

// Use `inspect` for lists so that quoted items keep the quotes.
// See https://github.com/sass/sass/issues/2383#issuecomment-336349172
--font-family-sans-serif: #{inspect($font-family-sans-serif)};
--font-family-monospace: #{inspect($font-family-monospace)};
// Use `inspect` for lists so that quoted items keep the quotes.
// See https://github.com/sass/sass/issues/2383#issuecomment-336349172
--font-family-sans-serif: #{inspect($font-family-sans-serif)};
--font-family-monospace: #{inspect($font-family-monospace)};
}
@@ -10,10 +10,14 @@ http {
client_max_body_size 2048M;
include gzip.conf;
include mime.types;

server_tokens off;
add_header Referrer-policy "same-origin";
add_header X-Content-Type-Options "nosniff";
add_header X-Content-Type-Options "nosniff" always;
add_header X-Frame-Options "SAMEORIGIN" always;
add_header X-XSS-Protection "1; mode=block" always;
# add_header Content-Security-Policy "frame-ancestors 'self'; worker-src 'self';";

error_log /var/log/nginx/error.log debug;
fastcgi_cache_path /tmp/nginx_cache levels=1:2 keys_zone=ZUSAM:100m inactive=1m;
fastcgi_cache_key "$scheme$request_method$host$http_x_auth_token$request_uri";
@@ -40,7 +44,7 @@ http {
try_files $uri /index.html;
}

location ~ \.(js|png|css)$ {
location ~ \.(js|png|css|woff2)$ {
expires 1M;
add_header Cache-Control "public";
}
@@ -1,7 +1,8 @@
#!/bin/sh

# There are 3 possible instance types: "default", "demo" and "new"
# "new" will create a new instance.
set -xe

# There are 2 possible instance types: "default" and "demo"
# "demo" will create a new instance that resets every day.
# "default" will assume you have a working db.

@@ -44,5 +45,7 @@ cd /zusam/app
yarn && yarn serve
chmod 755 -R /zusam/public

rm -rf /zusam/app /zusam/api/var/*

chown -R "${UID}:${GID}" /etc/s6.d /var/log/ /var/tmp/ /etc/php7 /etc/nginx /run/nginx /zusam
exec /bin/s6-svscan /etc/s6.d

0 comments on commit c5359a8

Please sign in to comment.
You can’t perform that action at this time.