feat: latest changes from website-template

Author: keskiju

CONFIGURATION.md

@@ -126,7 +126,7 @@ All unit tests are run automatically during build (see the `Dockerfile.build` fi
 
 ### Integration and end-to-end tests
 
-All integration and end-to-end test suites are run automatically after application has been deployed to dev environment. You can use any test tools that have been installed as development dependency inside the `builder` container (see `Dockerfile.build`). You can specify your environment specific test settings in `taito-config.sh` using `test_` as prefix. You can access database in your tests as database proxy is run automatically in background (see `docker-compose-test.yaml`). If the test tools generate reports, screenshots or videos, they should be placed at the `/service/test/reports`, `/service/test/screenshots` and `/service/test/videos` directories.
+All integration and end-to-end test suites are run automatically after application has been deployed to dev environment. You can use any test tools that have been installed as development dependency inside the `builder` container (see `Dockerfile.build`). You can specify your environment specific test settings in `taito-test-config.sh` using `test_` as prefix. You can access database in your tests as database proxy is run automatically in background (see `docker-compose-test.yaml`). If the test tools generate reports, screenshots or videos, they should be placed at the `/service/test/reports`, `/service/test/screenshots` and `/service/test/videos` directories.
 
 Tests are grouped in test suites (see the `test-suites` files). All test suites can be kept independent by cleaning up data before each test suite execution by running `taito init --clean`. You can enable data cleaning in `taito-config.sh` with the `ci_exec_test_init` setting, but you should use it for dev environment only.
 

www/Dockerfile

@@ -6,10 +6,8 @@ ARG SERVICE_DIR=.
 RUN apt-get -y update && apt-get -y install rsync # rsync for windows devs
 ENV NODE_ENV development
 
-# https://github.com/gatsbyjs/gatsby/issues/11406#issuecomment-485278936
-RUN echo fs.inotify.max_user_watches=524288 | tee -a /etc/sysctl.conf
-
 RUN mkdir /service && chown node:node /service
+
 WORKDIR /service
 COPY ${SERVICE_DIR}/install.sh \
      ${SERVICE_DIR}/package* \

www/Dockerfile.build

@@ -10,10 +10,8 @@ ENV BUILD_VERSION ${BUILD_VERSION}
 ENV NODE_ENV development
 ENV APP_SENTRY_PUBLIC_DSN #sentryPublicDSN
 
-# https://github.com/gatsbyjs/gatsby/issues/11406#issuecomment-485278936
-RUN echo fs.inotify.max_user_watches=524288 | tee -a /etc/sysctl.conf
-
 RUN mkdir /service && chown node:node /service
+
 WORKDIR /service
 COPY ${SERVICE_DIR}/*.sh \
      ${SERVICE_DIR}/package* \
@@ -33,7 +31,7 @@ FROM nginx:1.15-alpine
 ARG BUILD_VERSION
 LABEL version=${BUILD_VERSION} \
       company=companyname \
-      project=website-template \
+      project=server-template \
       role=www
 WORKDIR /service
 RUN chown -R nginx:nginx /var/cache/nginx && \

www/Dockerfile.webhook

@@ -3,14 +3,11 @@ ARG SERVICE_DIR=.
 ARG BUILD_VERSION
 LABEL version=${BUILD_VERSION} \
       company=companyname \
-      project=website-template \
+      project=server-template \
       role=webhook
 RUN apt-get -y update && \
     apt-get -y install git webhook
 
-# https://github.com/gatsbyjs/gatsby/issues/11406#issuecomment-485278936
-RUN echo fs.inotify.max_user_watches=524288 | tee -a /etc/sysctl.conf
-
 WORKDIR /service
 COPY ${SERVICE_DIR}/*.sh \
      ${SERVICE_DIR}/*.json \

www/README.md

@@ -1,6 +1,6 @@
 ## Configuration
 
-Configure static site generator of your choice with the following instructions. Currently instructions are provided only for Gatsby, Hugo and Jekyll, but with some extra work the website-template may easily be used with any static site generator.
+Configure static site generator of your choice with the following instructions. Currently instructions are provided only for Gatsby, Hugo and Jekyll, but with some extra work the server-template may easily be used with any static site generator.
 
 Remove static site generators that you do not use from `www/install.sh`.
 
@@ -11,6 +11,8 @@ Start containers, and start a shell inside the www Docker container:
     taito start
     taito shell:www
 
+*FOR PLAIN STATIC FILES:* Exit the shell and add static files to www/assets with your code editor.
+
 *FOR GATSBY ONLY:* Create a new Gatsby site based on one of the [starters](https://www.gatsbyjs.org/starters?v=2) (NOTE: Select 'npm' as package manager and ignore the 'git commit' error):
 
     su node

www/build-site.sh

@@ -2,23 +2,27 @@
 
 set -x
 
-if [ ! -d ./site ]; then
-  echo No site yet.
-elif [ -f ./site/package.json ]; then
+if [ -f ./site/package.json ]; then
   # Gatsby build
   cd site && \
-  npm run build -- --prefix-paths && \
+  npm run build --prefix-paths && \
   cp -rf ./public/* /build
 elif [ -f ./site/Gemfile ]; then
   # Jekyll build
   cd site && \
   jekyll build && \
   cp -rf /_site/* /build
-else
+elif [ -f ./site/config.toml ]; then
   # Hugo build
   cd site && \
   hugo && \
   cp -rf ./public/* /build
+else
+  echo No site yet.
+fi
+
+if [ -d ./assets ]; then
+  cp -rf ./assets/* /build
 fi
 
 # TODO configure live reload for all of these

www/build-webhook.sh

@@ -9,7 +9,7 @@ if [ "${1}" = "install" ]; then
     cp -rf /build-orig/* /build
   fi
   # Clone git and install libraries for real-time builds
-  git clone "https://${WEBHOOK_VC_TOKEN}@${VC_REPOSITORY_URL/\//:}" repository && \
+  git clone "https://${WEBHOOK_VC_TOKEN}@${VC_REPOSITORY_URL}" repository && \
   cd /service/repository/www && \
   git checkout "${COMMON_ENV}" && \
   npm run install-site

www/cypress.json

@@ -1,5 +1,5 @@
 {
-  "baseUrl": "https://website-template-dev.mydomain.com",
+  "baseUrl": "https://server-template-dev.mydomain.com",
   "fixturesFolder": "test/fixtures",
   "integrationFolder": "test/integration",
   "pluginsFile": "test/plugins/index.js",

www/develop.sh

@@ -21,6 +21,9 @@ elif [ -f ./site/config.toml ]; then
   hugo server -D --bind=0.0.0.0 --port 8080 \
     --baseURL "http://localhost:${COMMON_PUBLIC_PORT}" --appendPort=false \
     --liveReloadPort "${COMMON_PUBLIC_PORT}"
+elif [ -d ./assets ]; then
+  echo "Serving static assets from www/assets"
+  npm run serve
 else
   echo "develop.sh: No site yet at www/site. Just keep the container running."
   tail -f /dev/null