diff --git a/Dockerfile b/Dockerfile index 95661c2..02aa228 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,10 @@ FROM alpine:latest LABEL description="This is a cc65 Docker container intended to be used for build pipelines." ENV BUILD_DIR="/tmp" \ - CC65_VERSION="V2.16" \ + CC65_VERSION="V2.17" \ NULIB2_VERSION="v3.1.0" \ - AC_VERSION="1.3.5.14" + AC_RELEASE="v1-4-0" \ + AC_VERSION="1.4.0" COPY bin /usr/local/bin @@ -15,8 +16,8 @@ RUN apk add --no-cache build-base && \ wget https://github.com/cc65/cc65/archive/${CC65_VERSION}.tar.gz && \ tar xzf ${CC65_VERSION}.tar.gz && \ cd cc65* && \ - env prefix=/usr/local make && \ - env prefix=/usr/local make install && \ + env PREFIX=/usr/local make && \ + env PREFIX=/usr/local make install && \ echo "Building NuLib2 ${NULIB2_VERSION}" && \ cd ${BUILD_DIR} && \ wget https://github.com/fadden/nulib2/archive/${NULIB2_VERSION}.tar.gz && \ @@ -31,9 +32,9 @@ RUN apk add --no-cache build-base && \ make && \ make install && \ echo "Adding AppleCommander" && \ - wget https://sites.google.com/site/drjohnbmatthews/applecommander/AppleCommander-${AC_VERSION}-ac.jar && \ + wget https://github.com/AppleCommander/AppleCommander/releases/download/${AC_RELEASE}/AppleCommander-ac-${AC_VERSION}.jar && \ mkdir -p /usr/local/share/java && \ - mv AppleCommander-${AC_VERSION}-ac.jar /usr/local/share/java/AppleCommander-ac.jar && \ + mv AppleCommander-ac-${AC_VERSION}.jar /usr/local/share/java/AppleCommander-ac.jar && \ echo "Cleaning up" && \ cd ${BUILD_DIR} && \ rm -rf * && \ diff --git a/README.md b/README.md index 99aa0a5..27a5e42 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,7 @@ to submit a pull request! * [NuLib2](http://nulib.com/) to support creation of ShrinkIt archives. * [AppleCommander](https://applecommander.github.io/) to support creation of disk - images. Specifically [John Matthews'](https://sites.google.com/site/drjohnbmatthews/applecommander) - `ac` command is present. + images. # Samples @@ -66,9 +65,8 @@ build: stage: build script: - make hello - - make clean - ac -pro140 hello.po HELLO - - cat hello | ac -cc65 hello.po hello BIN + - cat hello | ac -as hello.po hello - ac -l hello.po - nulib2 -ak hello.shk hello.po - nulib2 -v hello.shk