fixed rebase issue

Author: David Zuckerman

Dockerfile

@@ -41,6 +41,7 @@ COPY --chown=bfs Gemfile* .ruby-version ./
 RUN bundle config set force_ruby_platform true
 RUN bundle config set system 'true'
 RUN bundle install
+<<<<<<< HEAD
 
 # COPY --chown=bfs:bfs . .
 
@@ -52,6 +53,20 @@ FROM base AS production
 # Copy the built codebase from the dev stage
 # COPY --from=development --chown=bfs /opt/app /opt/app
 COPY --from=development --chown=bfs /usr/local/bundle /usr/local/bundle
+=======
+
+# COPY --chown=bfs:bfs . .
+
+# =================================
+# Target: production
+# =================================
+FROM base AS production
+
+# Copy the built codebase from the dev stage
+# COPY --from=development --chown=bfs /opt/app /opt/app
+COPY --from=development --chown=bfs /usr/local/bundle /usr/local/bundle
+
+USER bfs
 
 WORKDIR /opt/app
 RUN bundle config set frozen 'true'

docker-compose.yml

@@ -13,8 +13,8 @@ services:
       - ./:/opt/app:rw
       - ./secrets:/run/secrets:ro
     secrets:
-      - source: SSH_KEY 
-        target: /opt/app/.ssh/id_rsa
+      - source: SSH_KEY
+        target: /home/bfs/.ssh/id_rsa
         uid: "40061"
         gid: "40061"
         mode: 0400