Skip to content

pop/smtp/tcp_server general cleanup to remove dead code #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliemirabile merged 3 commits into from
Mar 17, 2024
Merged

pop/smtp/tcp_server general cleanup to remove dead code #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb4b694
smtp/pop: Containerfile: Remove old dead code
charliemirabile Mar 16, 2024
a2ffad4
tcp_server/smtp/pop: Containerfile: prefer COPY to ADD
charliemirabile Mar 16, 2024
a81047a
tcp_server/smtp/pop: Makefile: add debug toggle with make argument
charliemirabile Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pop/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ RUN apk add \
make \
;

ADD . /pop
COPY . /pop

RUN make -C /pop CC='clang -static'

RUN mkdir -p /mnt/mail

#FROM fedora:latest as smtp
Comment thread
charliemirabile marked this conversation as resolved.
#RUN dnf -y update && dnf -y install libselinux-utils && dnf clean all
FROM scratch as pop
COPY --from=build /mnt/mail /mnt/mail
VOLUME /mnt/mail
Expand Down
5 changes: 4 additions & 1 deletion pop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
CC = clang
CFLAGS = -std=c2x -Weverything -Wno-unsafe-buffer-usage -Wno-c++98-compat -Wno-gnu-designator -Wno-gnu-case-range -Wno-initializer-overrides \
-Wno-declaration-after-statement -Wno-four-char-constants -Wno-pre-c2x-compat -Wno-disabled-macro-expansion -D_GNU_SOURCE
#CFLAGS += -DDEBUG -Og -g
Comment thread
charliemirabile marked this conversation as resolved.

ifdef DEBUG
CFLAGS += -DDEBUG -Og -g
endif

.PHONY: all clean

Expand Down
4 changes: 1 addition & 3 deletions smtp/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add \
make \
;

ADD . /smtp
COPY . /smtp

ARG hostname
RUN test -n "$hostname" || (echo 'hostname is not set' && false)
Expand All @@ -13,8 +13,6 @@ RUN make -C /smtp CC='clang -static' SRVNAME=$hostname

RUN mkdir -p /mnt/email_data/mail /mnt/email_data/logs

#FROM fedora:latest as smtp
#RUN dnf -y update && dnf -y install libselinux-utils && dnf clean all
FROM scratch as smtp
COPY --from=build /mnt/email_data /mnt/email_data
VOLUME /mnt/email_data/
Expand Down
6 changes: 5 additions & 1 deletion smtp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ CC = clang
CFLAGS = -std=c2x -Weverything -Wno-unsafe-buffer-usage -Wno-c++98-compat -Wno-gnu-designator \
-Wno-initializer-overrides -Wno-declaration-after-statement -Wno-four-char-constants \
-Wno-pre-c2x-compat -Wno-disabled-macro-expansion -D_GNU_SOURCE -DHOSTNAME='"$(SRVNAME)"'
#CFLAGS += -DDEBUG -Og -g

ifdef DEBUG
CFLAGS += -DDEBUG -Og -g
endif

.PHONY: all clean
all: smtp

Expand Down
2 changes: 1 addition & 1 deletion tcp_server/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add \
make \
;

ADD . /tcp_server
Comment thread
charliemirabile marked this conversation as resolved.
COPY . /tcp_server

RUN make -C /tcp_server CC='clang -static'

Expand Down
5 changes: 4 additions & 1 deletion tcp_server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
CC = clang
CFLAGS = -std=c2x -Weverything -Wno-declaration-after-statement -Wno-c++98-compat -Wno-padded \
-Wno-unsafe-buffer-usage -Wno-disabled-macro-expansion -Wno-pre-c2x-compat -D_GNU_SOURCE
#CFLAGS += -DDEBUG -Og -g

ifdef DEBUG
CFLAGS += -DDEBUG -Og -g
endif

.PHONY: all clean

Expand Down