Skip to content
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

test 4.0.1 #131

Merged
merged 5 commits into from
Oct 24, 2023
Merged

test 4.0.1 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a27711
test 4.0.1
vsoch Oct 24, 2023
32d344f
version bump
vsoch Oct 24, 2023
e3139b8
bump docker base
vsoch Oct 24, 2023
0e0eb6a
Update Dockerfile
vsoch Oct 24, 2023
b50059e
python -> python3
vsoch Oct 24, 2023
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
13 changes: 6 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18.10-alpine as base
FROM golang:1.21.3-alpine as base

################################################################################
#
Expand All @@ -19,19 +19,19 @@ FROM golang:1.18.10-alpine as base
#
################################################################################

FROM docker:18.09.8 as builder
FROM docker:24.0.6-git as builder
COPY --from=base /go /go
COPY --from=base /usr/local/go /usr/local/go
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
ENV GOLANG_VERSION 1.18.10
ENV GOLANG_VERSION 1.21.3

RUN apk update && \
apk add --virtual automake build-base linux-headers libffi-dev
apk add --virtual .build-deps autoconf automake build-base linux-headers libffi-dev
RUN apk add --no-cache bash git openssh gcc squashfs-tools sudo libtool gawk ca-certificates libseccomp libseccomp-dev
RUN apk add --no-cache linux-headers build-base openssl-dev util-linux util-linux-dev python rsync cryptsetup glib-dev
RUN apk add --no-cache linux-headers build-base openssl-dev util-linux util-linux-dev shadow-uidmap fuse3-dev python3 rsync cryptsetup glib-dev

ENV SINGULARITY_VERSION 3.11.4
ENV SINGULARITY_VERSION 4.0.1
RUN mkdir -p /usr/local/var/singularity/mnt && \
mkdir -p $GOPATH/src/github.com/sylabs && \
cd $GOPATH/src/github.com/sylabs && \
Expand All @@ -56,4 +56,3 @@ ADD addLabel.py /addLabel.py
ADD scripts /scripts
RUN chmod a+x docker2singularity.sh
ENTRYPOINT ["docker-entrypoint.sh", "/docker2singularity.sh"]

2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10.5
4.0.1