Compare commits

..

No commits in common. "7482786c2283ced6a4e0561dc7fcd30a1180578c" and "3d26e338e2dcd1a07ecd5d4da4d5bb7dd810d2db" have entirely different histories.

6 changed files with 96 additions and 40 deletions

45
Makefile Normal file
View File

@ -0,0 +1,45 @@
APP_ENV := dev
APP_OUTPUT_DIR := output_dev
APP_URL := homepage.site
APP_NPM_BUILD_CMD := build
ifeq ($(TARGET), prod)
APP_ENV := prod
APP_OUTPUT_DIR := output_prod
APP_URL := https://vakhrushev.me
APP_NPM_BUILD_CMD := build-prod
endif
# Building
clean:
rm -rf ./${APP_OUTPUT_DIR}/*
build-assets:
./tools/npm run "${APP_NPM_BUILD_CMD}"
build-site:
./tools/sculpin generate \
--env="${APP_ENV}" \
--url="${APP_URL}" \
--no-interaction \
-vv
build: clean build-assets build-site
build-prod:
$(MAKE) build TARGET=prod
watch: clean build-assets
./tools/sculpin generate \
--env="${APP_ENV}" \
--watch \
--server \
--port=8000 \
--no-interaction
# Deploy
deploy: build-prod
invoke deploy

View File

@ -36,18 +36,14 @@ tasks:
cmds: cmds:
- docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" composer {{.CLI_ARGS}} - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" composer {{.CLI_ARGS}}
npm:
cmds:
- docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" npm {{.CLI_ARGS}}
sculpin:
cmds:
- docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" ./vendor/bin/sculpin {{.CLI_ARGS}}
shell-node: shell-node:
cmds: cmds:
- docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" bash - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" bash
npm:
cmds:
- docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" npm {{.CLI_ARGS}}
install-dependencies: install-dependencies:
cmds: cmds:
- task: composer - task: composer
@ -74,35 +70,3 @@ tasks:
format-php: format-php:
cmds: cmds:
- docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" php-cs-fixer fix - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" php-cs-fixer fix
build-dev:
vars:
APP_OUTPUT_DIR: output_dev
NPM_SCRIPT: build
APP_ENV: dev
APP_URL: homepage.site
cmds:
- rm -rf ./{{.APP_OUTPUT_DIR}}/*
- task: npm
vars: { CLI_ARGS: 'run {{.NPM_SCRIPT}}' }
- task: sculpin
vars: { CLI_ARGS: 'generate --env="{{.APP_ENV}}" --url="{{.APP_URL}}" --no-interaction -vv' }
build-prod:
vars:
APP_OUTPUT_DIR: output_prod
NPM_SCRIPT: build-prod
APP_ENV: prod
APP_URL: https://vakhrushev.me
cmds:
- rm -rf ./{{.APP_OUTPUT_DIR}}/*
- task: npm
vars: { CLI_ARGS: 'run {{.NPM_SCRIPT}}' }
- task: sculpin
vars: { CLI_ARGS: 'generate --env="{{.APP_ENV}}" --url="{{.APP_URL}}" --no-interaction -vv' }
make-post:
vars:
POST_DATE:
sh: date +'%Y-%m-%d'
cmd: touch "source/_articles/{{.POST_DATE}}-new-post.md"

15
tools/dep Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
source .env
docker run \
--rm \
--interactive \
--tty \
--user "$UID:$(id -g)" \
--volume /etc/passwd:/etc/passwd:ro \
--volume /etc/group:/etc/group:ro \
--volume "$HOME:$HOME" \
--volume "$PWD:/srv/app" \
"${PHP_IMAGE}" \
dep "$@"

5
tools/mkpost Executable file
View File

@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -eux
touch "source/_articles/$(date +'%Y-%m-%d')-$1.md"

12
tools/php-cs-fixer Executable file
View File

@ -0,0 +1,12 @@
#!/bin/bash
source .env
docker run \
--rm \
--interactive \
--tty \
--user "$UID:$(id -g)" \
--volume "$PWD:/srv/app" \
"${PHP_IMAGE}" \
php-cs-fixer "$@"

15
tools/sculpin Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
source .env
docker run \
--rm \
--interactive \
--tty \
--init \
--user "$UID:$(id -g)" \
--volume="$PWD:/srv/app" \
--expose=8000 \
--publish=8000:8000 \
"${PHP_IMAGE}" \
./vendor/bin/sculpin "$@"