Cleanup and Feedbacks (#298)

- Reduced the number of layers for Dockerfile
- Removed travis.yml and install-crossdock-deps.sh
- Removed double build of crossdock image

Signed-off-by: Ashmita Bohara <[email protected]>

Author: Ashmita152

.github/workflows/ci-unit-tests.yml

@@ -36,7 +36,7 @@ jobs:
           tornado: ">=5,<6"
         - python: "3.7"
           tornado: ">=6"
-    name: ci-tests (py ${{ matrix.version.python }} tornado ${{ matrix.version.tornado }})
+    name: unit-tests (py ${{ matrix.version.python }} tornado ${{ matrix.version.tornado }})
     steps:
     - uses: actions/checkout@v2
       with:

.travis.yml

@@ -3,25 +3,17 @@ FROM python:2.7
 ARG tornado
 ENV APPDIR /usr/src/app/
 ENV TORNADO=$tornado
-RUN mkdir -p ${APPDIR}
 WORKDIR ${APPDIR}
 
 # Application installation
-COPY requirements-dev.txt ${APPDIR}
-COPY requirements-tests.txt ${APPDIR}
-COPY requirements.txt ${APPDIR}
-
-COPY setup.py ${APPDIR}
-COPY setup.cfg ${APPDIR}
+COPY requirements-dev.txt requirements-tests.txt requirements.txt setup.py setup.cfg ${APPDIR}
 COPY jaeger_client ${APPDIR}/jaeger_client/
 COPY idl ${APPDIR}/idl/
 
 # RUN pip install -U 'pip>=7,<8'
-RUN pip install --no-cache-dir -r requirements-dev.txt
-RUN pip install --no-cache-dir -r requirements-tests.txt
-RUN pip install --no-cache-dir -r requirements.txt
-RUN python setup.py install
-RUN pip install --no-cache-dir "tornado${TORNADO}"
+RUN pip install --no-cache-dir -r requirements-dev.txt -r requirements-tests.txt -r requirements.txt && \
+    python setup.py install && \
+    pip install --no-cache-dir "tornado${TORNADO}"
 
 COPY crossdock ${APPDIR}/crossdock/
 COPY crossdock/setup_crossdock.py ${APPDIR}

crossdock/Dockerfile

@@ -57,6 +57,7 @@ services:
             - "8080-8082"
 
     python:
+        image: jaegertracing/xdock-py
         build:
             context: ../.
             args:

crossdock/docker-compose.yml

@@ -21,10 +21,8 @@ else
   exit 0
 fi
 
-docker build -f crossdock/Dockerfile \
-	--build-arg tornado=$TORNADO \
-	--tag $REPO:$COMMIT .
-
+# This image is already built in "make crossdock" step
+# not specifying a tag means "latest" tag implicitly
+docker tag $REPO $REPO:$COMMIT
 docker tag $REPO:$COMMIT $REPO:$TAG
-docker tag $REPO:$COMMIT $REPO:gh-$GITHUB_RUN_NUMBER
 docker push $REPO