Skip to content

Commit c4e279b

Browse files
author
Andrew Welch
committed
Merge branch 'release/1.2.15' into v1
2 parents e16366b + 13eacb4 commit c4e279b

34 files changed

+1892
-2725
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Transcoder Changelog
22

3+
## 1.2.15 - 2021.03.03
4+
### Changed
5+
* Dockerized the buildchain, using `craft-plugin-manifest` for the webpack HMR bridge
6+
37
## 1.2.14 - 2021.01.03
48
### Changed
59
* Changed how we detect whether the transcoding processing is running, so it will work with Alpine Linux

Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ARG TAG=12-alpine
2+
FROM nystudio107/node-dev-base:$TAG
3+
4+
WORKDIR /app/buildchain/
5+
6+
CMD ["run build"]
7+
8+
ENTRYPOINT ["npm"]

Makefile

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
TAG?=12-alpine
2+
CONTAINER?=transcoder-buildchain
3+
DEST?=../../sites/nystudio107/web/docs/transcoder
4+
5+
.PHONY: dist docker docs install npm
6+
7+
dist: docker docs install
8+
docker container run \
9+
--name ${CONTAINER} \
10+
--rm \
11+
-t \
12+
-v `pwd`:/app \
13+
nystudio107/${CONTAINER}:${TAG} \
14+
run build
15+
docker:
16+
docker build \
17+
. \
18+
-t nystudio107/${CONTAINER}:${TAG} \
19+
--build-arg TAG=${TAG} \
20+
--no-cache
21+
docs:
22+
docker container run \
23+
--name ${CONTAINER} \
24+
--rm \
25+
-t \
26+
-v `pwd`:/app \
27+
nystudio107/${CONTAINER}:${TAG} \
28+
run docs
29+
rm -rf ${DEST}
30+
mv ./docs/docs/.vuepress/dist ${DEST}
31+
install:
32+
docker container run \
33+
--name ${CONTAINER} \
34+
--rm \
35+
-t \
36+
-v `pwd`:/app \
37+
nystudio107/${CONTAINER}:${TAG} \
38+
install
39+
npm:
40+
docker container run \
41+
--name ${CONTAINER} \
42+
--network plugindev_default \
43+
--rm \
44+
-t \
45+
-p 8080:8080 \
46+
-v `pwd`:/app \
47+
nystudio107/${CONTAINER}:${TAG} \
48+
$(filter-out $@,$(MAKECMDGOALS))
49+
%:
50+
@:
51+
# ref: https://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line

buildchain/.env.example

Lines changed: 0 additions & 6 deletions
This file was deleted.

buildchain/example.env

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# webpack example settings for Docker
2+
PUBLIC_PATH=""
3+
DEVSERVER_PUBLIC="http://localhost:8080"
4+
DEVSERVER_HOST="0.0.0.0"
5+
DEVSERVER_POLL=0
6+
DEVSERVER_PORT=8080

buildchain/get-webpack-config.js

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)