Skip to content

Commit

Permalink
Merge pull request #128 from singularityhub/v3.11.0
Browse files Browse the repository at this point in the history
add 3.11.0
  • Loading branch information
vsoch committed Feb 10, 2023
2 parents 496bb8a + 83a9979 commit 8a1117b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.17.8-alpine as base
FROM golang:1.18.10-alpine as base

################################################################################
#
# Copyright (C) 2019-2022 Vanessa Sochat.
# Copyright (C) 2019-2023 Vanessa Sochat.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
Expand All @@ -24,14 +24,14 @@ 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.17.8
ENV GOLANG_VERSION 1.18.10

RUN apk update && \
apk add --virtual 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

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

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ The last argument (without a letter) is the name of the docker image, as you wou

If you want a legacy version, see the following other branches:

- [v3.10.5](https://github.com/singularityhub/docker2singularity/tree/v3.10.5): Version 3.10.5 of Singularity.
- [v3.10.3](https://github.com/singularityhub/docker2singularity/tree/v3.10.3): Version 3.10.3 of Singularity.
- [v3.10.2](https://github.com/singularityhub/docker2singularity/tree/v3.10.2): Version 3.10.2 of Singularity.
- [v3.10.1](https://github.com/singularityhub/docker2singularity/tree/v3.10.1): Version 3.10.1 of Singularity.
Expand Down

0 comments on commit 8a1117b

Please sign in to comment.