Stop building moth-devel, prepare for version bump

This commit is contained in:
Neale Pickett 2021-03-26 21:20:22 -06:00
parent 17a8b7f9cb
commit adde9e76c3
3 changed files with 8 additions and 20 deletions

View File

@ -4,12 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [unreleased] ## [v4.2] - 2020-03-26
### Changed ### Changed
- example/5/draggable.js fix for FireFox to prevent dropping a draggable trying to load a URL - example/5/draggable.js fix for FireFox to prevent dropping a draggable trying to load a URL
- `transpile` arguments now work the same way for the transpile binary as they do for mkpuzzle - `transpile` arguments now work the same way for the transpile binary as they do for mkpuzzle
- `transpile inventory` does what you expect: inventory of current category, not inventory of all categories - `transpile inventory` does what you expect: inventory of current category, not inventory of all categories
### Removed
- No longer building a `moth-devel` image,
this is now handled by the
[moth-devel repository](https://github.com/dirtbags/moth-devel).
### Fixed ### Fixed
- `transpile` will now run `mkcategory` and `mkpuzzle` when invoked without `-dir` - `transpile` will now run `mkcategory` and `mkpuzzle` when invoked without `-dir`

View File

@ -26,20 +26,3 @@ RUN cp /go/bin/* /target/bin/
FROM scratch AS moth FROM scratch AS moth
COPY --from=prodbuild /target / COPY --from=prodbuild /target /
ENTRYPOINT [ "/bin/mothd" ] ENTRYPOINT [ "/bin/mothd" ]
##########
# You should use the dirtbags/moth-devel repo's build for this, instead
FROM ubuntu AS moth-devel
RUN apt-get -y update && apt-get -y install \
build-essential \
bsdgames \
figlet toilet \
lua5.3 \
python3 \
python3-pil \
python3-scapy \
python3-yaml \
cowsay
COPY --from=builder /target /
COPY --from=builder /go/bin/* /bin/
CMD [ "/bin/mothd", "-puzzles", "/puzzles" ]

View File

@ -7,12 +7,12 @@ cd $(dirname $0)/../..
PODMAN=$(command -v podman || echo docker) PODMAN=$(command -v podman || echo docker)
VERSION=$(cat CHANGELOG.md | awk -F '[][]' '/^## \[/ {print $2; exit}') VERSION=$(cat CHANGELOG.md | awk -F '[][]' '/^## \[/ {print $2; exit}')
for target in moth moth-devel; do for target in moth; do
tag=dirtbags/$target:$VERSION tag=dirtbags/$target:$VERSION
echo "==== Building $tag" echo "==== Building $tag"
$PODMAN build \ $PODMAN build \
--build-arg http_proxy --build-arg https_proxy --build-arg no_proxy \ --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy \
--tag dirtbags/$target \ --tag $tag \
--target $target \ --target $target \
-f build/package/Containerfile . -f build/package/Containerfile .
done done