Merge remote-tracking branch 'origin/main'

.env.example

@@ -0,0 +1,3 @@
+UID=1000
+GID=1000
+PORT=8000

.gitignore

@@ -1,53 +1,6 @@
 /bin
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
 
 /node_modules/
-/.php_cs.cache
 /vendor/
 
 # Logs
@@ -105,6 +58,7 @@ typings/
 
 # dotenv environment variable files
 .env*
+!.env.example
 
 # gatsby files
 .cache/

docker-compose.yml → compose.yaml

@@ -1,14 +1,12 @@
-version: '3.1'
-
 services:
   app:
     build:
       context: .
       dockerfile: ./docker/node/Dockerfile
     restart: always
-    user: 1000:1000
+    user: ${UID:-1000}:${GID:-1000}
     ports:
-      - 8000:8000
+      - ${PORT:-8000}:8000
     volumes:
       - ./:/var/www
     command: ["npm", "run", "docker-develop"]

content/blog/2022/07/auto-push/index.md

@@ -1 +1,29 @@
+---
+title: How to set up remote branch tracking automatically in Git
+date: "2022-07-01"
+description: "Learn how to set up remote branch tracking automatically in Git."
+category: "git"
+tags:
+- git
+- config
+---
+
+Do you often get this message when you try to push your changes to the remote repository?
+
+```bash
+There is no tracking information for the current branch.
+Please specify which branch you want to merge with.
+See git-pull(1) for details
+
+    git pull <remote> <branch>
+
+If you wish to set tracking information for this branch you can do so with:
+
+    git branch --set-upstream-to=origin/<branch> mybranch
+```
+
+There is a simple solution to this problem. You can set up the remote branch to track the local branch automatically by running the following command:
+
+```bash
 git config --global --add --bool push.autoSetupRemote true
+```

docker/node/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:18-alpine
 
 MAINTAINER Jakub Vyvazil <[email protected]>
 
@@ -17,7 +17,7 @@ RUN apk add --no-cache libsodium \
        gcc make g++
 
 # update npm
-RUN npm install -g npm@8.3.1
+RUN npm install -g npm@10.8.2
 
 COPY docker/node/docker-entrypoint.sh /usr/local/bin/
 

docker/node/docker-entrypoint.sh

@@ -9,6 +9,7 @@ echo "---"
 echo ""
 
 npm install
+npx browserslist@latest --update-db
 
 echo ""
 echo "▓▓▓▒▒░░ All done, enjoy development ░░▒▒▓▓▓";

gatsby-config.js

@@ -123,9 +123,6 @@ module.exports = {
     },
     `gatsby-plugin-react-helmet`,
     `gatsby-plugin-gatsby-cloud`,
-    {
-      resolve: "gatsby-plugin-build-date",
-    },
     {
       resolve: "gatsby-plugin-categories",
       options: {