updated Dockerfile

alphagov · Feb 7, 2024 · c35bc85 · c35bc85
1 parent 94b8779
commit c35bc85
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,12 +16,7 @@ COPY . .
 RUN bundle install
 RUN npm install
 
-<<<<<<< HEAD
 EXPOSE 3000
-=======
-# Expose port 8888
-EXPOSE 8888
->>>>>>> origin/dockerise-basic
 
 # Run a shell
 #CMD ["bundle", "exec", "rails", "server"]