Skip to content

Commit

Permalink
Merge branch 'master' into cassandra_scylla_support
Browse files Browse the repository at this point in the history
  • Loading branch information
fruch authored Mar 27, 2022
2 parents d3d1af6 + 6641b25 commit 039c2f0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Usage within Docker (i.e. in a CI)

When trying to launch a testcontainer from within a Docker container two things have to be provided:

1. The container has to provide a docker client installation. Either use an image that has docker pre-installed (e.g. the [official docker images](https://hub.docker.com/_/docker)) or install the client from within the `Dockerfile` specification.
1. The container has to provide a docker client installation. Either use an image that has docker pre-installed (e.g. the `official docker images <https://hub.docker.com/_/docker>`_) or install the client from within the `Dockerfile` specification.
2. The container has to have access to the docker daemon which can be achieved by mounting `/var/run/docker.sock` or setting the `DOCKER_HOST` environment variable as part of your `docker run` command.


Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ description-file = README.md

[flake8]
max-line-length = 100
exclude = .git,__pycache__,build,dist,venv,.venv
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@
},
long_description_content_type="text/x-rst",
long_description=long_description,
python_requires='>=3.5',
python_requires='>=3.6',
)
5 changes: 4 additions & 1 deletion testcontainers/oracle.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class OracleDbContainer(DbContainer):
-------
::
with OracleDbContainer():
with OracleDbContainer() as oracle:
e = sqlalchemy.create_engine(oracle.get_connection_url())
result = e.execute("select 1 from dual")
"""
Expand All @@ -24,3 +24,6 @@ def get_connection_url(self):
dialect="oracle", username="system", password="oracle", port=self.container_port,
db_name="xe"
)

def _configure(self):
pass

0 comments on commit 039c2f0

Please sign in to comment.