From b9066f325f5ec2ac38a479f0cf40198bdf9a8e97 Mon Sep 17 00:00:00 2001 From: Norman Abramovitz Date: Fri, 8 Sep 2023 13:33:11 -0700 Subject: [PATCH] Adding sbcl 2.4 image 1. Use the source forge binary build for linux/amd64. The only downside is that image does not support compressed executables. The ubuntu sbcl version is just too old and has issues running on a containerized environmments on the M1 macos 2. Update the Makefile to pass in BUILD information Upgraded to used sbcl 2.4.11 --- .gitignore | 1 + ci/pipeline.yml | 3 + concourse-cl/{jammy => 2.4}/Dockerfile | 0 concourse-cl/{jammy => 2.4}/Makefile | 7 +- concourse-cl/{jammy => 2.4}/README.md | 1 - concourse-cl/2.4/build-pipeline-arg-file | 8 ++ concourse-cl/2.4/pipeline.yml | 74 +++++++++++++++++++ concourse-cl/{jammy => 2.4}/tests/hello-world | 0 concourse-cl/bionic/.gitignore | 0 concourse-cl/pipeline.yml | 1 + 10 files changed, 93 insertions(+), 2 deletions(-) rename concourse-cl/{jammy => 2.4}/Dockerfile (100%) rename concourse-cl/{jammy => 2.4}/Makefile (77%) rename concourse-cl/{jammy => 2.4}/README.md (99%) create mode 100755 concourse-cl/2.4/build-pipeline-arg-file create mode 100644 concourse-cl/2.4/pipeline.yml rename concourse-cl/{jammy => 2.4}/tests/hello-world (100%) delete mode 100644 concourse-cl/bionic/.gitignore create mode 100644 concourse-cl/pipeline.yml diff --git a/.gitignore b/.gitignore index 54ff3c3..2fbfda5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ cf7 cf8 bosh +pipeline-build-args-file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index eabbf27..6170cb9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -9,6 +9,9 @@ groups: - name: concourse-go jobs: - "build-concourse-go_*" + - name: concourse-cl + jobs: + - "build-concourse-cl_*" notgroups: - name: concourse-java diff --git a/concourse-cl/jammy/Dockerfile b/concourse-cl/2.4/Dockerfile similarity index 100% rename from concourse-cl/jammy/Dockerfile rename to concourse-cl/2.4/Dockerfile diff --git a/concourse-cl/jammy/Makefile b/concourse-cl/2.4/Makefile similarity index 77% rename from concourse-cl/jammy/Makefile rename to concourse-cl/2.4/Makefile index f85af7b..f50ddcf 100644 --- a/concourse-cl/jammy/Makefile +++ b/concourse-cl/2.4/Makefile @@ -2,8 +2,13 @@ ORG := genesiscommunity NAME := concourse-cl TAG := ubuntu-jammy PLATFORM := linux/amd64 -SF_SBCL_VERSION := 2.4.4 +SF_SBCL_VERSION := 2.4.11 +.PHONY: build-pipeline-arg-file + +build-pipeline-arg-file: export SF_SBCL_VERSION:=$(SF_SBCL_VERSION) +build-pipeline-arg-file: + ./build-pipeline-arg-file docker: docker build \ diff --git a/concourse-cl/jammy/README.md b/concourse-cl/2.4/README.md similarity index 99% rename from concourse-cl/jammy/README.md rename to concourse-cl/2.4/README.md index b5d3542..fa1106e 100644 --- a/concourse-cl/jammy/README.md +++ b/concourse-cl/2.4/README.md @@ -15,4 +15,3 @@ By default the image will execute a lisp code stored in the file docker run -it \ -v ~/code/my-lisp-code-directory:/u \ genesiscommunity/concourse-cl:ubuntu-jammy - diff --git a/concourse-cl/2.4/build-pipeline-arg-file b/concourse-cl/2.4/build-pipeline-arg-file new file mode 100755 index 0000000..d9ce9cc --- /dev/null +++ b/concourse-cl/2.4/build-pipeline-arg-file @@ -0,0 +1,8 @@ +cat <<-EOF >pipeline-build-args-file +{ + "SF_SBCL_VERSION": "${SF_SBCL_VERSION}", + "BUILD_DATE": "$(date -u -Iminutes)", + "VCS_URL": "$(git ls-remote --get-url origin)", + "VCS_REF": "$(git rev-parse --short HEAD)" +} +EOF diff --git a/concourse-cl/2.4/pipeline.yml b/concourse-cl/2.4/pipeline.yml new file mode 100644 index 0000000..33b9db3 --- /dev/null +++ b/concourse-cl/2.4/pipeline.yml @@ -0,0 +1,74 @@ +--- +resource_types: +- name: static + type: docker-image + source: { repository: ktchen14/static-resource } + +resources: + # Dockerfile source + - name: 'concourse-cl_2_4-dockerfile' + .: (( inject meta.resources.dockerfiles )) + source: + paths: + - concourse-cl/2.4/Dockerfile + + # Triggers for new version of golang 1.20 + #- name: golang-version + # .: (( inject meta.resources.dockerhub )) + # type: registry-image + # source: + # email: ((prune)) + # repository: golang + # tag: '1.20' + + # Extra tags + - name: concourse-cl-2.4-additional-tags + type: static + source: + values: "2.4 2.4-ubuntu-jammy" + + # Build outputs + - name: concourse-cl_latest-image + .: (( inject meta.resources.local-registry )) + source: + repository: (( concat meta.image-registry.account "/concourse-cl" )) + tag: latest + + - name: concourse-cl_latest-dockerhub + .: (( inject meta.resources.dockerhub )) + source: + repository: (( concat meta.dockerhub.account "/concourse-cl" )) + tag: latest + + +jobs: + - name: build-concourse-cl_2_4 + public: true + plan: + - get: additional-tags + resource: concourse-cl-2.4-additional-tags + + - get: concourse-cl_2_4-dockerfile + trigger: true + + # - get: golang-version + # trigger: true + # params: {skip_download: true} + + - get: concourse-image + resource: concourse_ubuntu-jammy-image + trigger: true + passed: [ 'build-concourse_ubuntu-jammy' ] + params: {skip_download: true} + + - put: 'concourse-cl_latest-image' + get_params: {save: true} + params: + build: 'concourse-cl_2_4-dockerfile/concourse-cl/2.4' + additional_tags: additional-tags/values + + - put: concourse-cl_latest-dockerhub + params: + load: concourse-cl_latest-image + additional_tags: additional-tags/values + diff --git a/concourse-cl/jammy/tests/hello-world b/concourse-cl/2.4/tests/hello-world similarity index 100% rename from concourse-cl/jammy/tests/hello-world rename to concourse-cl/2.4/tests/hello-world diff --git a/concourse-cl/bionic/.gitignore b/concourse-cl/bionic/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/concourse-cl/pipeline.yml b/concourse-cl/pipeline.yml new file mode 100644 index 0000000..2fbf0ff --- /dev/null +++ b/concourse-cl/pipeline.yml @@ -0,0 +1 @@ +--- {}