fix docker

Author: Christian Newman

.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
           # Wait for up to 10 minutes for the service to start
           timeout=600
           while [ $timeout -gt 0 ]; do
-            if curl -s "http://localhost:5000/cache/numberArray/DECLARATION" > /dev/null; then
+            if curl -s "http://localhost:8080/cache/numberArray/DECLARATION" > /dev/null; then
               echo "Service is ready"
               break
             fi
@@ -83,7 +83,7 @@ jobs:
           # Wait for up to 5 minutes for the service to start and load models
           timeout=300
           while [ $timeout -gt 0 ]; do
-            if curl -s "http://localhost:5000/cache/numberArray/DECLARATION" > /dev/null; then
+            if curl -s "http://localhost:8080/cache/numberArray/DECLARATION" > /dev/null; then
               echo "Service is ready"
               break
             fi
@@ -101,7 +101,7 @@ jobs:
       
       - name: Test tagger endpoint
         run: |
-          response=$(curl -s "http://localhost:5000/cache/numberArray/DECLARATION")
+          response=$(curl -s "http://localhost:8080/cache/numberArray/DECLARATION")
           if [ -z "$response" ]; then
             echo "No response from tagger"
             exit 1

Dockerfile

@@ -29,52 +29,46 @@ COPY src/classifier_multiclass.py \
 COPY input/* /input/.
 COPY models/model_GradientBoostingClassifier.pkl /models/.
 
-# Make main executable
-RUN chmod +x /main -r
-
-# Expose the port the server will run on
-EXPOSE 8080
-
-CMD date && \
-    echo "Download..." && \
-    remote_target_date=$(curl -sI http://131.123.42.41/target_vecs.txt | grep -i "Last-Modified" | cut -d' ' -f2-) && \
-    remote_token_date=$(curl -sI http://131.123.42.41/token_vecs.txt | grep -i "Last-Modified" | cut -d' ' -f2-) && \
-    remote_words_date=$(curl -sI http://131.123.42.41/abbreviationList.csv | grep -i "Last-Modified" | cut -d' ' -f2-) && \
-    remote_dictionary_date=$(curl -sI htp://131.123.42.41/en.txt | grep -i "Last-Modified" | cut -d' ' -f2-) && \
+CMD date; \
+    echo "Download..."; \
+    remote_target_date=$(curl -sI http://131.123.42.41/target_vecs.txt | grep -i "Last-Modified" | cut -d' ' -f2-); \
+    remote_token_date=$(curl -sI http://131.123.42.41/token_vecs.txt | grep -i "Last-Modified" | cut -d' ' -f2-); \
+    remote_words_date=$(curl -sI http://131.123.42.41/abbreviationList.csv | grep -i "Last-Modified" | cut -d' ' -f2-); \
+    remote_dictionary_date=$(curl -sI htp://131.123.42.41/en.txt | grep -i "Last-Modified" | cut -d' ' -f2-); \
     if [ -n "$remote_target_date" ] && [ -n "$remote_token_date" ]; then \
-        remote_target_timestamp=$(date -d "$remote_target_date" +%s) && \
-        remote_token_timestamp=$(date -d "$remote_token_date" +%s) && \
-        remote_words_timestamp=$(date -d "$remote_words_date" +%s) && \
-        remote_dictionary_timestamp=$(date -d "$remote_dictionary_date" +%s) && \
+        remote_target_timestamp=$(date -d "$remote_target_date" +%s); \
+        remote_token_timestamp=$(date -d "$remote_token_date" +%s); \
+        remote_words_timestamp=$(date -d "$remote_words_date" +%s); \
+        remote_dictionary_timestamp=$(date -d "$remote_dictionary_date" +%s); \
         if [ ! -f /code2vec/target_vecs.txt ] || [ $remote_target_timestamp -gt $(date -r /code2vec/target_vecs.txt +%s) ]; then \
-            curl -s -o /code2vec/target_vecs.txt http://131.123.42.41/target_vecs.txt && \
+            curl -s -o /code2vec/target_vecs.txt http://131.123.42.41/target_vecs.txt; \
             echo "target_vecs.txt updated"; \
         else \
             echo "target_vecs.txt not updated"; \
-        fi && \
+        fi; \
         if [ ! -f /code2vec/token_vecs.txt ] || [ $remote_token_timestamp -gt $(date -r /code2vec/token_vecs.txt +%s) ]; then \
-            curl -s -o /code2vec/token_vecs.txt http://131.123.42.41/token_vecs.txt && \
+            curl -s -o /code2vec/token_vecs.txt http://131.123.42.41/token_vecs.txt; \
             echo "token_vecs.txt updated"; \
         else \
             echo "token_vecs.txt not updated"; \
-        fi && \
+        fi; \
         if [ ! -r /words/abbreviationList.csv ] || [ $remote_words_timestamp -gt $(date -r /words/abbreviationList.csv +%s) ]; then \
-            curl -s -o /words/abbreviationList.csv http://131.123.42.41/abbreviationList.csv && \
+            curl -s -o /words/abbreviationList.csv http://131.123.42.41/abbreviationList.csv; \
             echo "abbreviationList.csv updated"; \
         else \
             echo "abbreviationList.csv not updated"; \
-        fi && \
+        fi; \
         if [ ! -r /words/en.txt ] || [ $remote_dictionary_timestamp -gt $(date -r /words/en.txt +%s) ]; then \
-            curl -s -o /words/en.txt http://131.123.42.41/en.txt && \
+            curl -s -o /words/en.txt http://131.123.42.41/en.txt; \
             echo "en.txt updated"; \
         else \
             echo "en.txt not updated"; \
         fi; \
     else \
         echo "Failed to retrieve Last-Modified headers"; \
-    fi && \
-    date && \
-    echo "Starting server..." && \
+    fi; \
+    date; \
+    echo "Running..."; \
     /main -r --words words/abbreviationList.csv
 
 ENV TZ=US/Michigan

serve.json

@@ -1,6 +1,6 @@
 {
     "address": "0.0.0.0",
-    "port": 5000,
+    "port": 8080,
     "protocol": "https",
     "words":""
 }