Skip to content

Commit 544f9e2

Browse files
committed
Revert "add tests for storing packages"
This reverts commit ca2f49f505bd5c951b5f270d4b218a69848a6de9.
1 parent a381d69 commit 544f9e2

File tree

8 files changed

+1577
-1603
lines changed

8 files changed

+1577
-1603
lines changed

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
3+
<<<<<<< HEAD
34

45
=======
56
>>>>>>> b6d23428 (Revert "Revert "add tests for storing packages"")
7+
=======
8+
>>>>>>> 507231a0 (Revert "add tests for storing packages")
69
# SPDX-License-Identifier: Apache-2.0
710
#
811
# http://nexb.com and https://github.com/aboutcode-org/scancode.io
@@ -97,6 +100,7 @@ RUN pip install --no-cache-dir .
97100

98101
# Copy the codebase and set the proper permissions for the APP_USER
99102
<<<<<<< HEAD
103+
<<<<<<< HEAD
100104
COPY --chown=$APP_USER:$APP_USER . $APP_DIR
101105
=======
102106
COPY --chown=$APP_USER:$APP_USER . $APP_DIR
@@ -197,3 +201,6 @@ RUN pip install --no-cache-dir .
197201
# Copy the codebase and set the proper permissions for the APP_USER
198202
COPY --chown=$APP_USER:$APP_USER . $APP_DIR
199203
>>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
204+
=======
205+
COPY --chown=$APP_USER:$APP_USER . $APP_DIR
206+
>>>>>>> 507231a0 (Revert "add tests for storing packages")

0 commit comments

Comments
 (0)