Skip to content

Commit baf4d0a

Browse files
committed
remove debug code and updated Dockerfile
1 parent fc7d73a commit baf4d0a

6 files changed

Lines changed: 24 additions & 246 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ log*
1414
features/
1515
msk*
1616
sc_test*
17+
.specstory
18+

Dockerfile

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
1-
FROM debian:bookworm-slim as builder
1+
FROM debian:bookworm-slim AS builder
2+
ARG VERSION=1.0.0
23
ARG DEBIAN_FRONTEND=noninteractive
3-
RUN apt-get -y update && apt-get -y install build-essential zlib1g-dev libbz2-dev liblzma-dev libcurl4-openssl-dev libgomp1 libglib2.0-dev libcairo2-dev
4-
ADD assignBarcodes.c /code/assignBarcodes.c
5-
ADD Makefile /code/Makefile
6-
ADD queue.h /code/queue.h
7-
ADD queue.c /code/queue.c
8-
ADD defines.h /code/defines.h
9-
ADD plasma*.h /code/.
10-
WORKDIR /code
4+
RUN apt-get -y update && apt-get -y install build-essential zlib1g-dev libbz2-dev liblzma-dev libcurl4-openssl-dev libgomp1 libglib2.0-dev curl libcairo2-dev libx11-dev libxext-dev libxrender-dev
5+
RUN curl -L https://github.com/morphic-bio/process_features/archive/refs/tags/v${VERSION}.tar.gz | tar -xz
6+
WORKDIR /process_features-${VERSION}
117
RUN make && mv assignBarcodes /usr/local/bin/assignBarcodes
12-
RUN apt-get -y remove build-essential && apt-get -y autoremove
138

149
FROM debian:bookworm-slim
1510
COPY --from=builder /usr/local/bin/assignBarcodes /usr/local/bin/assignBarcodes
1611
#copy the zlib1g library and libglib2.0 libgomp.so.0
17-
COPY --from=builder /usr/lib/x86_64-linux-gnu/* /usr/lib/x86_64-linux-gnu/.
18-
# **Copy the font configuration files**
19-
COPY --from=builder /etc/fonts /etc/fonts
12+
#copy the libcairo2 libpixman-1 libfontconfig1 libfreetype6 libpng16 libxcb* lib-xrender libraries
13+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/lib/x86_64-linux-gnu/libpng16.so.16
14+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1
15+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libfreetype.so.6 /usr/lib/x86_64-linux-gnu/libfreetype.so.6
16+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libpixman-1.so.0 /usr/lib/x86_64-linux-gnu/libpixman-1.so.0
17+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libcairo.so.2 /usr/lib/x86_64-linux-gnu/libcairo.so.2
18+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libgomp.so.1 /usr/lib/x86_64-linux-gnu/libgomp.so.1
19+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0
20+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libz.so.1 /usr/lib/x86_64-linux-gnu/libz.so.1
21+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libxcb* /usr/lib/x86_64-linux-gnu/
22+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libX* /usr/lib/x86_64-linux-gnu/
23+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libexpat.so.1 /usr/lib/x86_64-linux-gnu/libexpat.so.1
24+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libbrotlidec.so.1 /usr/lib/x86_64-linux-gnu/libbrotlidec.so.1
25+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libbrotlicommon.so.1 /usr/lib/x86_64-linux-gnu/libbrotlicommon.so.1
26+
COPY --from=builder /usr/lib/x86_64-linux-gnu/libbsd.so.0 /usr/lib/x86_64-linux-gnu/libbsd.so.0
2027

21-
# **Copy the system fonts**
22-
COPY --from=builder /usr/share/fonts /usr/share/fonts
28+
ENV OMP_NESTED=TRUE
29+
ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu

assignBarcodes.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,6 @@ int print_feature_sequences(feature_arrays *features, int *total_counts, char *d
873873
lowerCaseDifferences(features->feature_sequences[entry->feature_index-1],annotated_sequence,feature_length);
874874
fprintf(feature_sequencesfp, "%3d %s %2d %7d %s\n", entry->feature_index,annotated_sequence, entry->hamming_distance,entry->counts,features->feature_names[entry->feature_index-1]);
875875
}
876-
exit(0);
877876
return 0;
878877
}
879878

bad

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)