Docker fixes

Author: kavanase

.devcontainer/devcontainer.json

@@ -5,11 +5,7 @@
     "remoteEnv": {
         "VSCODE_SERVER_DIR": "/home/vscode/.vscode-server"
     },
-    "runArgs": [
-        "--user",
-        "1000:1000"
-    ],
     "workspaceFolder": "/usr/src/app",
-    "remoteUser": "vscode",
+    "remoteUser": "root",
     "forwardPorts": [4000] // Add port forwarding
 }

Dockerfile

@@ -22,14 +22,19 @@ RUN chown -R vscode:vscode /usr/src/app
 USER vscode
 
 # Copy Gemfile into the container (necessary for `bundle install`)
-COPY Gemfile ./
+COPY Gemfile Gemfile.lock ./
 
 
+RUN gem install bundler:2.3.26 \
+ && bundle config set deployment 'true' \
+ && bundle config set path '/usr/local/bundle' \
+ && bundle install --without development test
 
 # Install bundler and dependencies
-RUN gem install connection_pool:2.5.0
-RUN gem install bundler:2.3.26
-RUN bundle install
+#RUN gem install connection_pool:2.5.0
+#RUN gem install bundler:2.3.26
+#RUN bundle install
 
 # Command to serve the Jekyll site
-CMD ["jekyll", "serve", "-H", "0.0.0.0", "-w", "--config", "_config.yml,_config_docker.yml"]
+CMD ["bash", "-lc", "bundle exec jekyll serve -H 0.0.0.0 -w --config _config.yml,_config_docker.yml"]
+#CMD ["jekyll", "serve", "-H", "0.0.0.0", "-w", "--config", "_config.yml,_config_docker.yml"]

docker-compose.yaml

@@ -1,9 +1,21 @@
 services:
   jekyll-site:
-    image: jekyll-site
-    build: .
-    volumes: [ .:/usr/src/app ]
-    ports: [ 4000:4000 ]
-    user: 1000:1000
-    environment: [ JEKYLL_ENV=docker ]
-    command: jekyll serve -H 0.0.0.0 -w --config _config.yml,_config_docker.yml
+    build:
+      context: .
+      dockerfile: Dockerfile
+    # use the bundle-installed jekyll:
+    command: ["bash","-lc","bundle exec jekyll serve -H 0.0.0.0 -w --config _config.yml,_config_docker.yml"]
+    ports:
+      - "4000:4000"
+    volumes:
+      - ./:/usr/src/app
+    # REMOVE any 'user: 1000:1000' line here (the image already sets USER)
+
+#services:
+#  jekyll-site:
+#    image: jekyll-site
+#    build: .
+#    volumes: [ .:/usr/src/app ]
+#    ports: [ 4000:4000 ]
+#    environment: [ JEKYLL_ENV=docker ]
+#    command: jekyll serve -H 0.0.0.0 -w --config _config.yml,_config_docker.yml