Skip to content

Commit

Permalink
version bump and disable dynamic versioning in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
tuxpeople committed Dec 22, 2020
1 parent 5840244 commit cea3312
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ jobs:
name: Generate Build-Args
id: build-args
run: |
MSSQL_VERSION=$(curl -s https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15 | grep "verify" | grep msodbcsql17 | awk '{ print $3}' | cut -d'_' -f2)
DNSPERF_VERSION=$(curl -w '%{url_effective}' -L -s -S https://github.com/DNS-OARC/dnsperf/releases/latest -o /dev/null | sed -e 's|.*/||' | sed 's|v||')
echo ::set-output name=build-arg1::"MSSQL_VERSION=${MSSQL_VERSION}"
echo ::set-output name=build-arg2::"DNSPERF_VERSION=${DNSPERF_VERSION}"
# echo ::set-output name=build-arg1::"buildarg1"
# echo ::set-output name=build-arg2::"buildarg2"
-
name: Hadolint
uses: brpaz/[email protected]
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
FROM alpine:3.12

# MSSQL_VERSION can be changed, by passing `--build-arg MSSQL_VERSION=<new version>` during docker build
ARG MSSQL_VERSION=17.5.2.1-1
# $(curl -s https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15 | grep "verify" | grep msodbcsql17 | awk '{ print $3}' | cut -d'_' -f2)
ARG MSSQL_VERSION=17.6.1.1-1
ENV MSSQL_VERSION=${MSSQL_VERSION}

# DNSPERF_VERSION can be changed, by passing `--build-arg DNSPERF_VERSION=<new version>` during docker build
ARG DNSPERF_VERSION=2.3.4
# $(curl -w '%{url_effective}' -L -s -S https://github.com/DNS-OARC/dnsperf/releases/latest -o /dev/null | sed -e 's|.*/||' | sed 's|v||')
ARG DNSPERF_VERSION=2.4.0
ENV DNSPERF_VERSION=dnsperf-${DNSPERF_VERSION}

# Resolve DL4006 https://github.com/hadolint/hadolint/wiki/DL4006
Expand Down

0 comments on commit cea3312

Please sign in to comment.