From 33e699e0b71a0c0d1d7b69c40a0ccab50ba33b32 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 15:34:20 +0100 Subject: [PATCH 1/7] [CENTOS] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-centos_amd64/Dockerfile | 4 ++-- apamacore-centos_amd64/README.md | 6 +++--- apamacore-centos_amd64/tag.sh | 4 ++-- apamacore-centos_amd64/test-version.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apamacore-centos_amd64/Dockerfile b/apamacore-centos_amd64/Dockerfile index b87da37..90fb7a0 100644 --- a/apamacore-centos_amd64/Dockerfile +++ b/apamacore-centos_amd64/Dockerfile @@ -1,5 +1,5 @@ ARG SAG_HOME=/opt/softwareag -ARG ACCE_VERSION=10.3.0.1 +ARG ACCE_VERSION=10.3.1.1 ARG ACCE_LIBRARY_VERSION=10.3 # Docker Mulit-stage build @@ -32,7 +32,7 @@ LABEL \ arch="x86-64" \ base="centos:7" \ maintainer="Kev Palfreyman (@kpalf)" \ - build-date="20181022" \ + build-date="20190428" \ version=${ACCE_VERSION} # Set the shell and create user identical to the official SAG images diff --git a/apamacore-centos_amd64/README.md b/apamacore-centos_amd64/README.md index 4d165be..e4631ad 100644 --- a/apamacore-centos_amd64/README.md +++ b/apamacore-centos_amd64/README.md @@ -6,11 +6,11 @@ The image can be found on DockerHub as specific tags on the `kpalf/apamacore` re Lookup the tags at: https://hub.docker.com/r/kpalf/apamacore/tags/ -You will also see tags for Apama Core on Ubuntu 18.10 for amd64, a couple of Windows Server Nano Server base images for amd64 (1809, 1803, and historically 1709), and Raspbian for ARMv7hf so please be careful. +You will also see tags for Apama Core on Ubuntu 19.04 / 18.10 for amd64, a couple of Windows Server Nano Server base images for amd64 (1809, 1803, and historically 1709), and Raspbian for ARMv7hf so please be careful. For example, for the CentOS (amd64) base initially there will be the following tagged image that you can pull with the following command: ``` -docker pull kpalf/apamacore:10.3.0.1_centos_amd64 +docker pull kpalf/apamacore:10.3.1.1_centos_amd64 ``` ## User ID @@ -29,7 +29,7 @@ To find out more about Apama, access full documentation, and download the distri ## Base image -The base image is "centos:7", which at the time of writing is CentOS 7.5 +The base image is "centos:7", which at the time of writing is CentOS 7.6 ## Licenses diff --git a/apamacore-centos_amd64/tag.sh b/apamacore-centos_amd64/tag.sh index 580ef02..ba42dbd 100644 --- a/apamacore-centos_amd64/tag.sh +++ b/apamacore-centos_amd64/tag.sh @@ -1,5 +1,5 @@ #!/bin/sh -docker tag apamacore:centos_amd64 kpalf/apamacore:10.3.0.1_centos_amd64 -# docker tag apamacore:centos_amd64 kpalf/apamacore:10.3.0.1 +docker tag apamacore:centos_amd64 kpalf/apamacore:10.3.1.1_centos_amd64 +# docker tag apamacore:centos_amd64 kpalf/apamacore:10.3.1.1 docker tag apamacore:centos_amd64 kpalf/apamacore:centos_amd64 # docker tag apamacore:centos_amd64 kpalf/apamacore:latest diff --git a/apamacore-centos_amd64/test-version.sh b/apamacore-centos_amd64/test-version.sh index 00c8f61..0814d18 100644 --- a/apamacore-centos_amd64/test-version.sh +++ b/apamacore-centos_amd64/test-version.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm kpalf/apamacore:10.3.0.1_centos_amd64 correlator --version +docker run --rm kpalf/apamacore:10.3.1.1_centos_amd64 correlator --version From a6e69e997dea0b0c3df3662cc263705694ed02b6 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 15:46:03 +0100 Subject: [PATCH 2/7] [DEBIAN-SLIM] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-debian-slim_amd64/Dockerfile | 4 ++-- apamacore-debian-slim_amd64/README.md | 4 ++-- apamacore-debian-slim_amd64/tag.sh | 2 +- apamacore-debian-slim_amd64/test-version.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apamacore-debian-slim_amd64/Dockerfile b/apamacore-debian-slim_amd64/Dockerfile index 88626f8..3145a6f 100644 --- a/apamacore-debian-slim_amd64/Dockerfile +++ b/apamacore-debian-slim_amd64/Dockerfile @@ -1,5 +1,5 @@ ARG SAG_HOME=/opt/softwareag -ARG ACCE_VERSION=10.3.0.1 +ARG ACCE_VERSION=10.3.1.1 ARG ACCE_LIBRARY_VERSION=10.3 # Docker Mulit-stage build @@ -37,7 +37,7 @@ LABEL \ arch="x86-64" \ base="debian:stretch-slim" \ maintainer="Kev Palfreyman (@kpalf)" \ - build-date="20181027" \ + build-date="20190428" \ version=${ACCE_VERSION} # Set the shell and create user identical to the official SAG images diff --git a/apamacore-debian-slim_amd64/README.md b/apamacore-debian-slim_amd64/README.md index 6f5d3d6..08d46ce 100644 --- a/apamacore-debian-slim_amd64/README.md +++ b/apamacore-debian-slim_amd64/README.md @@ -11,7 +11,7 @@ You will also see tags for Apama Core on CentOS 7 for amd64, Ubuntu for amd64, a For example, for the debian-slim (amd64) base initially there will be the following tagged image that you can pull with the following command: ``` -docker pull kpalf/apamacore:10.3.0.1_experimental-debian-slim_amd64 +docker pull kpalf/apamacore:10.3.1.1_experimental-debian-slim_amd64 ``` ## User ID @@ -31,7 +31,7 @@ To find out more about Apama, access full documentation, and download the distri ## Base image The base image is "debian:stretch-slim" ("stretch" == 9 == "stable"). -At the time of writing (Oct 2018) Stretch-slim was 22MB, which is smaller than Buster-slim at 26MB (buster==testing==9.5) +At the time of writing (Oct 2018, update April 2019) Stretch-slim was 22MB, which is smaller than Buster-slim at 27MB (buster==testing==9.5) diff --git a/apamacore-debian-slim_amd64/tag.sh b/apamacore-debian-slim_amd64/tag.sh index 0cdbfc8..a726554 100644 --- a/apamacore-debian-slim_amd64/tag.sh +++ b/apamacore-debian-slim_amd64/tag.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker tag apamacore:debian-slim_amd64 kpalf/apamacore:10.3.0.1_experimental-debian-slim_amd64 +docker tag apamacore:debian-slim_amd64 kpalf/apamacore:10.3.1.1_experimental-debian-slim_amd64 docker tag apamacore:debian-slim_amd64 kpalf/apamacore:experimental-debian-slim_amd64 diff --git a/apamacore-debian-slim_amd64/test-version.sh b/apamacore-debian-slim_amd64/test-version.sh index d8192fd..59df61e 100644 --- a/apamacore-debian-slim_amd64/test-version.sh +++ b/apamacore-debian-slim_amd64/test-version.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm kpalf/apamacore:10.3.0.1_experimental-debian-slim_amd64 correlator --version +docker run --rm kpalf/apamacore:10.3.1.1_experimental-debian-slim_amd64 correlator --version From d2fc937f12badea60cba3b71375ed648611b9624 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 16:02:12 +0100 Subject: [PATCH 3/7] [UBUNTU 19.04] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-ubuntu_amd64/Dockerfile | 9 +++++---- apamacore-ubuntu_amd64/README.md | 10 ++++++---- apamacore-ubuntu_amd64/tag.sh | 2 +- apamacore-ubuntu_amd64/test-version.sh | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/apamacore-ubuntu_amd64/Dockerfile b/apamacore-ubuntu_amd64/Dockerfile index 5d66c9c..b2a3701 100644 --- a/apamacore-ubuntu_amd64/Dockerfile +++ b/apamacore-ubuntu_amd64/Dockerfile @@ -1,11 +1,11 @@ ARG SAG_HOME=/opt/softwareag -ARG ACCE_VERSION=10.3.0.1 +ARG ACCE_VERSION=10.3.1.1 ARG ACCE_LIBRARY_VERSION=10.3 # Docker Mulit-stage build # First our builder image that has curl added to it and does the download of Apama Core -FROM ubuntu:18.10 as acce_build +FROM ubuntu:19.04 as acce_build ARG SAG_HOME ARG ACCE_VERSION @@ -20,6 +20,7 @@ RUN \ # Now make the real image that does not include 14MB of curl and dependencies +#19.04==disco (non-LTS) #18.10==cosmic (non-LTS) #18.04==bionic (LTS) #16.04==xenial (LTS) @@ -34,9 +35,9 @@ ARG ACCE_LIBRARY_VERSION LABEL \ name="Apama Core Community Edition" \ arch="x86-64" \ - base="ubuntu:18.10" \ + base="ubuntu:19.04" \ maintainer="Kev Palfreyman (@kpalf)" \ - build-date="20181022" \ + build-date="20190428" \ version=${ACCE_VERSION} # Set the shell and create user identical to the official SAG images diff --git a/apamacore-ubuntu_amd64/README.md b/apamacore-ubuntu_amd64/README.md index 45bd941..062e248 100644 --- a/apamacore-ubuntu_amd64/README.md +++ b/apamacore-ubuntu_amd64/README.md @@ -1,5 +1,5 @@ # (Unofficial) Apama Core Community Edition on Ubuntu Linux -Dockerfile for an _unofficial_ Apama Core Community Edition on a Ubuntu base image. Currently this is with the Ubuntu 18.10 release. +Dockerfile for an _unofficial_ Apama Core Community Edition on a Ubuntu base image. Currently this is with the Ubuntu 19.04 release. The Ubuntu base image used to be quite large but as of 18.04 are significantly smaller than the CentOS 7 (7.4 / 7.5) base images. ## Images and tags @@ -11,7 +11,7 @@ You will also see tags for Apama Core on CentOS 7 for amd64, a couple of Windows For example, for the Ubuntu (amd64) base initially there will be the following tagged image that you can pull with the following command: ``` -docker pull kpalf/apamacore:10.3.0.1_ubuntu_amd64 +docker pull kpalf/apamacore:10.3.1.1_ubuntu_amd64 ``` ## User ID @@ -30,9 +30,11 @@ To find out more about Apama, access full documentation, and download the distri ## Base image -The base image is "ubuntu:18.10" ("cosmic") - non-LTS. +The base image for Apama 10.3.1 is "ubuntu:19.04" ("disco") - non-LTS. -Previous images (Apama 10.2) were using Ubuntu 18.04 ("bionic") LTS. +Previous images: +* Apama 10.3.0 using Ubuntu 18.10 ("cosmic") - non-LTS. +* Apama 10.2 using Ubuntu 18.04 ("bionic") LTS. diff --git a/apamacore-ubuntu_amd64/tag.sh b/apamacore-ubuntu_amd64/tag.sh index 4913b4d..f2c9c82 100644 --- a/apamacore-ubuntu_amd64/tag.sh +++ b/apamacore-ubuntu_amd64/tag.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker tag apamacore:ubuntu_amd64 kpalf/apamacore:10.3.0.1_ubuntu_amd64 +docker tag apamacore:ubuntu_amd64 kpalf/apamacore:10.3.1.1_ubuntu_amd64 docker tag apamacore:ubuntu_amd64 kpalf/apamacore:ubuntu_amd64 diff --git a/apamacore-ubuntu_amd64/test-version.sh b/apamacore-ubuntu_amd64/test-version.sh index bd7edb6..35cdd10 100644 --- a/apamacore-ubuntu_amd64/test-version.sh +++ b/apamacore-ubuntu_amd64/test-version.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm kpalf/apamacore:10.3.0.1_ubuntu_amd64 correlator --version +docker run --rm kpalf/apamacore:10.3.1.1_ubuntu_amd64 correlator --version From 82c43d967cdae256fb1a7f6a0296b6a4a1863dc1 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 17:11:46 +0100 Subject: [PATCH 4/7] [EXPERIMENTAL MIN DEBIAN-SLIM] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-min_debian-slim_amd64/Dockerfile | 4 ++-- apamacore-min_debian-slim_amd64/README.md | 4 ++-- apamacore-min_debian-slim_amd64/tag.sh | 2 +- apamacore-min_debian-slim_amd64/test-version.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apamacore-min_debian-slim_amd64/Dockerfile b/apamacore-min_debian-slim_amd64/Dockerfile index 7008587..d0448cf 100644 --- a/apamacore-min_debian-slim_amd64/Dockerfile +++ b/apamacore-min_debian-slim_amd64/Dockerfile @@ -1,5 +1,5 @@ ARG SAG_HOME=/opt/softwareag -ARG ACCE_VERSION=10.3.0.1 +ARG ACCE_VERSION=10.3.1.1 ARG ACCE_LIBRARY_VERSION=10.3 # Docker Mulit-stage build @@ -56,7 +56,7 @@ LABEL \ arch="x86-64" \ base="debian:stretch-slim" \ maintainer="Kev Palfreyman (@kpalf)" \ - build-date="20181028" \ + build-date="20190428" \ version=${ACCE_VERSION} # Set the shell and create user identical to the official SAG images diff --git a/apamacore-min_debian-slim_amd64/README.md b/apamacore-min_debian-slim_amd64/README.md index 0b60884..d595612 100644 --- a/apamacore-min_debian-slim_amd64/README.md +++ b/apamacore-min_debian-slim_amd64/README.md @@ -13,7 +13,7 @@ You will also see tags for Apama Core on CentOS 7 for amd64, Ubuntu for amd64, a For example, for the debian-slim (amd64) base initially there will be the following tagged image that you can pull with the following command: ``` -docker pull kpalf/apamacore-min:10.3.0.1_experimental-debian-slim_amd64 +docker pull kpalf/apamacore-min:10.3.1.1_experimental-debian-slim_amd64 ``` ## User ID @@ -33,7 +33,7 @@ To find out more about Apama, access full documentation, and download the distri ## Base image The base image is "debian:stretch-slim" ("stretch" == 9 == "stable"). -At the time of writing (Oct 2018) Stretch-slim was 22MB, which is smaller than Buster-slim at 26MB (buster==testing==9.5) +At the time of writing (Oct 2018, update April 2019) Stretch-slim was 22MB, which is smaller than Buster-slim at 27MB (buster==testing==9.5) diff --git a/apamacore-min_debian-slim_amd64/tag.sh b/apamacore-min_debian-slim_amd64/tag.sh index 65144a8..90336c0 100644 --- a/apamacore-min_debian-slim_amd64/tag.sh +++ b/apamacore-min_debian-slim_amd64/tag.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker tag apamacore-min:debian-slim_amd64 kpalf/apamacore-min:10.3.0.1_experimental-debian-slim_amd64 +docker tag apamacore-min:debian-slim_amd64 kpalf/apamacore-min:10.3.1.1_experimental-debian-slim_amd64 docker tag apamacore-min:debian-slim_amd64 kpalf/apamacore-min:experimental-debian-slim_amd64 diff --git a/apamacore-min_debian-slim_amd64/test-version.sh b/apamacore-min_debian-slim_amd64/test-version.sh index da551c4..62d2874 100644 --- a/apamacore-min_debian-slim_amd64/test-version.sh +++ b/apamacore-min_debian-slim_amd64/test-version.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm kpalf/apamacore-min:10.3.0.1_experimental-debian-slim_amd64 correlator --version +docker run --rm kpalf/apamacore-min:10.3.1.1_experimental-debian-slim_amd64 correlator --version From 764f55c6793695502209e2349a29b082e2820923 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 17:36:39 +0100 Subject: [PATCH 5/7] [EXPERIMENTAL MIN DEBIAN-SLIM] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-min_debian-slim_amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apamacore-min_debian-slim_amd64/Dockerfile b/apamacore-min_debian-slim_amd64/Dockerfile index d0448cf..9d99469 100644 --- a/apamacore-min_debian-slim_amd64/Dockerfile +++ b/apamacore-min_debian-slim_amd64/Dockerfile @@ -12,7 +12,7 @@ ARG ACCE_VERSION # Start REMOVING unnecessary files from the interim builder image RUN rm -r ${SAG_HOME}/Release_Notes.pdf && \ - rm -r ${SAG_HOME}/3rdPartyLicenses.pdf && \ + rm -r ${SAG_HOME}/3rdPartyLicenses_PAK_ApamaCoreEdition.pdf && \ rm -r ${SAG_HOME}/common/lib && \ rm -r ${APAMA_HOME}/monitors/R && \ rm -r ${APAMA_HOME}/lib/rpath && \ From a206e80c43115481b166ee789b5c937fed415c71 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 17:54:57 +0100 Subject: [PATCH 6/7] [WINDOWS NANOSERVER 1803] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-nanoserver_amd64/Dockerfile | 4 ++-- apamacore-nanoserver_amd64/README.md | 7 +++---- apamacore-nanoserver_amd64/tag.bat | 2 +- apamacore-nanoserver_amd64/test-version.bat | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apamacore-nanoserver_amd64/Dockerfile b/apamacore-nanoserver_amd64/Dockerfile index a247999..85179b1 100644 --- a/apamacore-nanoserver_amd64/Dockerfile +++ b/apamacore-nanoserver_amd64/Dockerfile @@ -6,7 +6,7 @@ # https://hub.docker.com/r/microsoft/nanoserver/ ARG SAG_HOME=C:\\SoftwareAG -ARG ACCE_VERSION=10.3.0.1 +ARG ACCE_VERSION=10.3.1.1 ARG ACCE_LIBRARY_VERSION=10.3 ##################################################################### @@ -39,7 +39,7 @@ LABEL \ arch="x86-64" \ base="microsoft/nanoserver:1803" \ maintainer="Kev Palfreyman (@kpalf)" \ - build-date="20181015" \ + build-date="20190428" \ version=${ACCE_VERSION} # Set environment variables inside the image diff --git a/apamacore-nanoserver_amd64/README.md b/apamacore-nanoserver_amd64/README.md index 6a3c5f2..a3dc4cb 100644 --- a/apamacore-nanoserver_amd64/README.md +++ b/apamacore-nanoserver_amd64/README.md @@ -11,7 +11,7 @@ You will also see tags for Apama Core on other base images such as CentOS (amd64 The first nanoserver image for this repository was using version 1709, but as new releases become available it's moved forward, for example with version 1803. The nanoserver 1803 based image for Apama Core can be pulled with the following command: ``` -docker pull kpalf/apamacore:10.3.0.1_nanoserver_amd64_1803 +docker pull kpalf/apamacore:10.3.1.1_nanoserver_amd64_1803 ``` ## User ID @@ -33,10 +33,9 @@ To find out more about Apama, access full documentation, and download the distri Windows Server Nano Server has undergone significant changes since first release. The first LTS or GA release is known as `"10.0.14393."` and is around 400MB. However, the ones we want are the smaller ones that started with the "Fall Creators Update" or "1709", with tags `"1709_KB"`, and later the "1803" release. The 1709 release started nice and small at 93MB when it was first released, but have grown with each monthly update - the May 2018 is 132MB. The first 1803 release in May 2018 was 115MB, and by October 2018 is 145MB. -To use the nanoserver 1709 image, and layered images such as this one, your host OS needs to be either Windows 10 (Fall Creators Update / 1709), or Windows Server version 1709. -To use the nanoserver 1803 image, and layered images such as this one, your host OS needs to be either Windows 10 (1803), or Windows Server version 1803. The 1803 image might work on a 1709 host but is NOT recommended (I don't test this). +To use the nanoserver 1803 image, and layered images such as this one, your host OS needs to be either Windows 10 (1803 or later), or Windows Server version 1803 or later. The 1803 image might work on a 1709 host but is NOT recommended (I don't test this). -In future we will create a nanoserver 1809 image. +In future we will create a later nanoserver image based on either 1809 (or maybe whatever 19H1 is labelled as). For more info on Windows Container version compatibility wee the following: https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility diff --git a/apamacore-nanoserver_amd64/tag.bat b/apamacore-nanoserver_amd64/tag.bat index 5977658..8db914c 100644 --- a/apamacore-nanoserver_amd64/tag.bat +++ b/apamacore-nanoserver_amd64/tag.bat @@ -1 +1 @@ -docker tag apamacore:nanoserver_amd64_1803 kpalf/apamacore:10.3.0.1_nanoserver_amd64_1803 +docker tag apamacore:nanoserver_amd64_1803 kpalf/apamacore:10.3.1.1_nanoserver_amd64_1803 diff --git a/apamacore-nanoserver_amd64/test-version.bat b/apamacore-nanoserver_amd64/test-version.bat index e715901..12c37f6 100644 --- a/apamacore-nanoserver_amd64/test-version.bat +++ b/apamacore-nanoserver_amd64/test-version.bat @@ -1,2 +1,2 @@ docker run --rm apamacore:nanoserver_amd64_1803 correlator --version -docker run --rm kpalf/apamacore:10.3.0.1_nanoserver_amd64_1803 correlator --version +docker run --rm kpalf/apamacore:10.3.1.1_nanoserver_amd64_1803 correlator --version From 2888e463753ca9f8ddb836bd4c659208916765c2 Mon Sep 17 00:00:00 2001 From: Kev Palfreyman Date: Sun, 28 Apr 2019 18:07:53 +0100 Subject: [PATCH 7/7] [ARMv7HF RASPBIAN JESSIE] Update to Apama Core Community Edition 10.3.1.1 --- apamacore-raspbian_armv7hf/Dockerfile | 10 +++++----- apamacore-raspbian_armv7hf/README.md | 10 +++++----- apamacore-raspbian_armv7hf/tag.sh | 2 +- apamacore-raspbian_armv7hf/test-version.sh | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apamacore-raspbian_armv7hf/Dockerfile b/apamacore-raspbian_armv7hf/Dockerfile index ea3504e..4a62e10 100644 --- a/apamacore-raspbian_armv7hf/Dockerfile +++ b/apamacore-raspbian_armv7hf/Dockerfile @@ -1,11 +1,11 @@ ARG SAG_HOME=/opt/softwareag -ARG ACCE_VERSION=10.3.0.1 +ARG ACCE_VERSION=10.3.1.1 ARG ACCE_LIBRARY_VERSION=10.3 # Docker Mulit-stage build # First our builder image that does the download of Apama Core (some base images have to have curl added here) -FROM resin/rpi-raspbian:jessie as acce_build +FROM balenalib/rpi-raspbian:jessie as acce_build ARG SAG_HOME ARG ACCE_VERSION @@ -25,7 +25,7 @@ RUN \ # 8 == Jessie (obsolete stable) ** used here ** # 7 == Wheezy (obsolete stable) # 6 == Squeeze (obsolete stable) -FROM resin/rpi-raspbian:jessie +FROM balenalib/rpi-raspbian:jessie ARG SAG_HOME ARG APAMA_HOME=${SAG_HOME}/Apama ARG APAMA_WORK=/apama_work @@ -35,9 +35,9 @@ ARG ACCE_LIBRARY_VERSION LABEL \ name="Apama Core Community Edition" \ arch="armv7hf" \ - base="resin/rpi-raspbian:jessie" \ + base="balenalib/rpi-raspbian:jessie" \ maintainer="Kev Palfreyman (@kpalf)" \ - build-date="20181022" \ + build-date="20190428" \ version=${ACCE_VERSION} # Set the shell and create user identical to the official SAG images diff --git a/apamacore-raspbian_armv7hf/README.md b/apamacore-raspbian_armv7hf/README.md index 040c543..53801ac 100644 --- a/apamacore-raspbian_armv7hf/README.md +++ b/apamacore-raspbian_armv7hf/README.md @@ -13,7 +13,7 @@ You will also see tags for Apama Core on CentOS for amd64 (default), Ubuntu 18.1 For example, for the Raspbian (ARMv7hf) base there will be the following tagged image that you can pull with the following command: ``` -docker pull kpalf/apamacore:10.3.0.1_raspbian_armv7hf +docker pull kpalf/apamacore:10.3.1.1_raspbian_armv7hf ``` ## User ID @@ -32,13 +32,13 @@ To find out more about Apama, access full documentation, and download the distri ## Base image -The base image is "resin/rpi-raspbian:jessie", but at some point I'll upgrade to "stretch". +The base image is "balenalib/rpi-raspbian:jessie", (resin repo renamed to balenalib) but at some point I'll upgrade to "stretch". The Raspbian base is actually armv6, but that ought to be OK as the OS direct from RaspberryPi.org is the same. It's possible in future we might switch the base image from Raspbian (armv6hf) to Debian (armv7hf). -See the Docker Hub info on the base image: https://hub.docker.com/r/resin/rpi-raspbian/ -The base image is supplied and maintained by the good folks at http://resin.io, see their -documentation for further details: https://docs.resin.io/reference/base-images/resin-base-images/ +See the Docker Hub info on the base image: https://hub.docker.com/r/balenalib/rpi-raspbian +The base image is supplied and maintained by the good folks at https://www.balena.io/ (previosuly http://resin.io), see their +documentation for further details: https://www.balena.io/docs/reference/base-images/base-images/ ## Licenses diff --git a/apamacore-raspbian_armv7hf/tag.sh b/apamacore-raspbian_armv7hf/tag.sh index 29019b8..fbec2b5 100755 --- a/apamacore-raspbian_armv7hf/tag.sh +++ b/apamacore-raspbian_armv7hf/tag.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker tag apamacore:raspbian_armv7hf kpalf/apamacore:10.3.0.1_raspbian_armv7hf +docker tag apamacore:raspbian_armv7hf kpalf/apamacore:10.3.1.1_raspbian_armv7hf docker tag apamacore:raspbian_armv7hf kpalf/apamacore:raspbian_armv7hf diff --git a/apamacore-raspbian_armv7hf/test-version.sh b/apamacore-raspbian_armv7hf/test-version.sh index 86b6371..b710d40 100755 --- a/apamacore-raspbian_armv7hf/test-version.sh +++ b/apamacore-raspbian_armv7hf/test-version.sh @@ -1,4 +1,4 @@ #!/bin/sh docker run --rm apamacore:raspbian_armv7hf correlator --version -docker run --rm kpalf/apamacore:10.3.0.1_raspbian_armv7hf correlator --version +docker run --rm kpalf/apamacore:10.3.1.1_raspbian_armv7hf correlator --version docker run --rm kpalf/apamacore:raspbian_armv7hf correlator --version