Skip to content

Commit

Permalink
chore: Not pulling container images from Docker Hub.
Browse files Browse the repository at this point in the history
Signed-off-by: Paulo Vital <paulo.vital@ibm.com>
  • Loading branch information
pvital committed Nov 12, 2024
1 parent aafb2aa commit 403a870
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
20 changes: 11 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# Development Container
FROM python:3.8.5
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm

RUN apt update -q
RUN apt install -qy vim
RUN apt-get -y -qq update && \
apt-get -y -qq upgrade && \
apt-get -y -qq install --no-install-recommends git && \
apt-get -y -qq clean

WORKDIR /python-sensor
WORKDIR /python-tracer
COPY . ./

RUN pip install --upgrade pip && \
pip install -e .

ENV INSTANA_DEBUG=true
ENV PYTHONPATH=/python-sensor
ENV PYTHONPATH=/python-tracer
ENV AUTOWRAPT_BOOTSTRAP=instana

COPY . ./

RUN pip install -e .
22 changes: 12 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
version: '3.8'
services:
redis:
image: docker.io/library/redis
image: public.ecr.aws/docker/library/redis
volumes:
- ./tests/conf/redis.conf:/usr/local/etc/redis/redis.conf:Z
command: redis-server /usr/local/etc/redis/redis.conf
ports:
- "0.0.0.0:6379:6379"

cassandra:
image: docker.io/library/cassandra
image: public.ecr.aws/docker/library/cassandra
ports:
- 9042:9042


couchbase:
image: docker.io/library/couchbase
image: public.ecr.aws/docker/library/couchbase:community
ports:
- 8091-8094:8091-8094
- 11210:11210

mariadb:
image: docker.io/library/mariadb
image: public.ecr.aws/docker/library/mariadb
ports:
- 3306:3306
environment:
Expand All @@ -33,12 +33,12 @@ services:
- ./tests/config/database/mysql/conf.d/mysql.cnf:/etc/mysql/conf.d/mysql.cnf:Z

mongodb:
image: docker.io/library/mongo
image: public.ecr.aws/docker/library/mongo
ports:
- '27017:27017'

postgres:
image: docker.io/library/postgres
image: public.ecr.aws/docker/library/postgres
ports:
- 5432:5432
environment:
Expand All @@ -47,16 +47,18 @@ services:
POSTGRES_DB: instana_test_db

rabbitmq:
image: docker.io/library/rabbitmq
image: public.ecr.aws/docker/library/rabbitmq
environment:
- RABBITMQ_NODENAME=rabbit@localhost
ports:
- 5671:5671
- 5672:5672

pubsub:
image: docker.io/vanmoof/pubsub-emulator
image: quay.io/thekevjames/gcloud-pubsub-emulator:latest
environment:
- PUBSUB_EMULATOR_HOST=0.0.0.0:8085
- PUBSUB_EMULATOR_HOST=0.0.0.0:8681
- PUBSUB_PROJECT1=test-project,test-topic
ports:
- "8085:8085"
- "8681:8681"
- "8682:8682"
2 changes: 1 addition & 1 deletion tests/clients/test_google-cloud-pubsub.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from tests.test_utils import _TraceContextMixin

# Use PubSub Emulator exposed at :8085
os.environ["PUBSUB_EMULATOR_HOST"] = "localhost:8085"
os.environ["PUBSUB_EMULATOR_HOST"] = "localhost:8681"


class TestPubSubPublish(_TraceContextMixin):
Expand Down

0 comments on commit 403a870

Please sign in to comment.