Skip to content

Commit 9679d0e

Browse files
update to alpine 3.16
1 parent 8e61ea2 commit 9679d0e

5 files changed

Lines changed: 15 additions & 26 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/alpine/.devcontainer/base.Dockerfile
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/alpine/.devcontainer/base.Dockerfile
22

3-
# [Choice] Alpine version: 3.15, 3.14, 3.13
4-
ARG VARIANT="3.15"
3+
# [Choice] Alpine version: 3.16, 3.15, 3.14, 3.13
4+
ARG VARIANT="3.16"
55
FROM mcr.microsoft.com/vscode/devcontainers/base:0-alpine-${VARIANT}
66

77
#
@@ -17,18 +17,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:0-alpine-${VARIANT}
1717
RUN apk update \
1818
&& apk add --no-cache gettext lastpass-cli tar
1919

20-
ARG SHELLSPEC_VERSION=0.28.1
21-
RUN mkdir -p /opt \
22-
&& curl -SL "https://github.com/shellspec/shellspec/archive/${SHELLSPEC_VERSION}.tar.gz" \
23-
| tar -zxC /opt \
24-
&& ln -s /opt/shellspec-${SHELLSPEC_VERSION}/shellspec /usr/local/bin/shellspec
25-
26-
ARG CONCOURSE_VERSION=7.6.0
27-
RUN mkdir -p /opt/concourse-${CONCOURSE_VERSION} \
28-
&& curl -SL "https://github.com/concourse/concourse/releases/download/v${CONCOURSE_VERSION}/fly-${CONCOURSE_VERSION}-linux-amd64.tgz" \
29-
| tar -zxC /opt/concourse-${CONCOURSE_VERSION} \
30-
&& install /opt/concourse-${CONCOURSE_VERSION}/fly /usr/local/bin/fly
31-
3220
#
3321
# Resource dependencies
3422
#
@@ -57,3 +45,9 @@ RUN mkdir -p /opt/cf-cli-${CF_CLI_8_VERSION} \
5745
&& curl -SL "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=${CF_CLI_8_VERSION}" \
5846
| tar -zxC /opt/cf-cli-${CF_CLI_8_VERSION} \
5947
&& ln -s /opt/cf-cli-${CF_CLI_8_VERSION}/cf8 /usr/local/bin
48+
49+
ARG SHELLSPEC_VERSION=0.28.1
50+
RUN mkdir -p /opt \
51+
&& curl -SL "https://github.com/shellspec/shellspec/archive/${SHELLSPEC_VERSION}.tar.gz" \
52+
| tar -zxC /opt \
53+
&& ln -s /opt/shellspec-${SHELLSPEC_VERSION}/shellspec /usr/local/bin/shellspec

.devcontainer/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/alpine
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/alpine
33
{
44
"name": "Alpine",
55
"build": {
66
"dockerfile": "Dockerfile",
7-
// Update 'VARIANT' to pick an Alpine version: 3.13, 3.14, 3.15
8-
"args": { "VARIANT": "3.15" }
7+
// Update 'VARIANT' to pick an Alpine version: 3.13, 3.14, 3.15, 3.16
8+
"args": { "VARIANT": "3.16" }
99
},
1010

1111
// Use 'forwardPorts' to make a list of ports inside the container available locally.

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1616
- Updated to [cf7 cli v7.5.0](https://github.com/cloudfoundry/cli/releases/tag/v7.5.0)
1717
- Updated to [cf7 cli v8.4.0](https://github.com/cloudfoundry/cli/releases/tag/v8.4.0)
1818
- Updated `yq` cli to version `v4.26.1`! This was actually not a simple update from `v3` as `v4` is [quite different from previous versions.](https://mikefarah.gitbook.io/yq/upgrading-from-v3)
19-
- Updated to alpine `v3.15`
19+
- Updated to alpine `v3.16`
2020

2121
### Packaged Dependencies
2222

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.15
1+
FROM alpine:3.16
22

33
ADD resource/ /opt/resource/
44

@@ -10,33 +10,28 @@ RUN apk add --no-cache --update-cache ca-certificates \
1010
jq \
1111
util-linux
1212

13-
# Install yaml cli
1413
RUN curl -SL "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64" -o /usr/local/bin/yq \
1514
&& chmod +x /usr/local/bin/yq \
1615
&& yq --version
1716

18-
# Install Cloud Foundry cli v6
1917
ARG CF_CLI_6_VERSION=6.53.0
2018
RUN mkdir -p /opt/cf-cli-${CF_CLI_6_VERSION} \
2119
&& curl -SL "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=${CF_CLI_6_VERSION}" \
2220
| tar -zxC /opt/cf-cli-${CF_CLI_6_VERSION} \
2321
&& ln -s /opt/cf-cli-${CF_CLI_6_VERSION}/cf /usr/local/bin
2422

25-
# Install Cloud Foundry cli v7
2623
ARG CF_CLI_7_VERSION=7.5.0
2724
RUN mkdir -p /opt/cf-cli-${CF_CLI_7_VERSION} \
2825
&& curl -SL "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=${CF_CLI_7_VERSION}" \
2926
| tar -zxC /opt/cf-cli-${CF_CLI_7_VERSION} \
3027
&& ln -s /opt/cf-cli-${CF_CLI_7_VERSION}/cf7 /usr/local/bin
3128

32-
# Install Cloud Foundry cli v8
3329
ARG CF_CLI_8_VERSION=8.4.0
3430
RUN mkdir -p /opt/cf-cli-${CF_CLI_8_VERSION} \
3531
&& curl -SL "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=${CF_CLI_8_VERSION}" \
3632
| tar -zxC /opt/cf-cli-${CF_CLI_8_VERSION} \
3733
&& ln -s /opt/cf-cli-${CF_CLI_8_VERSION}/cf8 /usr/local/bin
3834

39-
# Install test dependencies
4035
ARG SHELLSPEC_VERSION=0.28.1
4136
RUN mkdir -p /opt \
4237
&& curl -SL "https://github.com/shellspec/shellspec/archive/${SHELLSPEC_VERSION}.tar.gz" \

pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ resources:
388388
icon: docker
389389
source:
390390
repository: alpine
391-
tag: 3.15
391+
tag: 3.16
392392

393393
resource_types:
394394
- name: cf-cli-resource

0 commit comments

Comments
 (0)