Skip to content

Commit b9e5129

Browse files
committed
Use pymssql in container.
1 parent e9f44fc commit b9e5129

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
ARG version=3.8
22
FROM python:${version}
33

4+
WORKDIR /workspace
5+
RUN pip install --upgrade pip \
6+
&& apt-get update \
7+
&& apt-get install -y \
8+
freetds-dev \
9+
&& rm -rf /var/lib/apt/lists/*
410
WORKDIR /workspace
511
ARG version=3.8
612
COPY requirements/${version}.txt requirements.txt

Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
PYTHON_VERSIONS = 3.6 3.7 3.8
1+
PYTHON_VERSIONS = 3.6 3.7 3.8 3.9
22
REQUIREMENTS = $(addprefix requirements/,${PYTHON_VERSIONS:=.txt})
33
TESTS = $(addprefix tests/,${PYTHON_VERSIONS})
44
IMAGES = $(addprefix image/,${PYTHON_VERSIONS})
5-
ARCH = $(shell arch)
6-
ifeq (${ARCH}, arm64)
7-
RUN = docker run --rm -it --platform linux/amd64
8-
else
9-
RUN = docker run --rm -it
10-
endif
5+
RUN = docker run --rm -it
6+
117
.PHONY : docs
128

139
# Default target
@@ -38,8 +34,8 @@ ${IMAGES} : image/% : requirements/%.txt
3834
tests : ${TESTS}
3935

4036
${TESTS} : tests/% : image/%
41-
${RUN} -v /var/run/docker.sock:/var/run/docker.sock testcontainers-python:$* bash -c \
42-
"flake8 && pytest -v ${ARGS}"
37+
${RUN} -v /var/run/docker.sock:/var/run/docker.sock testcontainers-python:$* \
38+
bash -c "flake8 && pytest -v ${ARGS}"
4339

4440
# Target to build the documentation
4541

0 commit comments

Comments
 (0)