Skip to content

Commit

Permalink
rework dockerfile; remove godebug
Browse files Browse the repository at this point in the history
  • Loading branch information
fairclothjm committed Jan 15, 2025
1 parent 437f531 commit 25ac6fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
12 changes: 6 additions & 6 deletions testutil/mssqlhelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ USER root
ENV MSDIR=/var/opt/mssql
RUN mkdir -p $MSDIR \
&& openssl req -x509 -nodes -newkey rsa:2048 -subj '/CN=mssql' -addext "subjectAltName = DNS:mssql" -keyout $MSDIR/mssql.key -out $MSDIR/mssql.pem -days 1 \
&& chmod 400 $MSDIR/mssql.key \
&& chmod 400 $MSDIR/mssql.pem \
&& chmod 400 /etc/ssl/private/mssql.key \
&& chmod 400 /etc/ssl/certs/mssql.pem \
&& chown -R mssql $MSDIR
RUN echo "[network]" > $MSDIR/mssql.conf \
&& echo "tlscert = $MSDIR/mssql.pem" >> $MSDIR/mssql.conf \
&& echo "tlskey = $MSDIR/mssql.key" >> $MSDIR/mssql.conf \
&& echo "tlsprotocols = 1.2" >> $MSDIR/mssql.conf \
&& echo "forceencryption = 1" >> $MSDIR/mssql.conf
&& echo "tlskey = /etc/ssl/private/mssql.key" >> $MSDIR/mssql.conf \
&& echo "tlscert = /etc/ssl/certs/mssql.pem" >> $MSDIR/mssql.conf \
&& echo "tlsprotocols = 1.2" >> $MSDIR/mssql.conf \
&& echo "forceencryption = 1" >> $MSDIR/mssql.conf
USER mssql
`
bCtx := docker.NewBuildContext()
Expand Down
5 changes: 0 additions & 5 deletions vault/resource_database_secret_backend_connection_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
//go:debug x509negativeserial=1

// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

// NOTE: x509negativeserial above is a workaround for /~https://github.com/microsoft/mssql-docker/issues/895 which manifests in our tests as
// tls: failed to parse certificate from server: x509: negative serial number in test case failures.

package vault

import (
Expand Down

0 comments on commit 25ac6fd

Please sign in to comment.