Skip to content
This repository has been archived by the owner on Sep 7, 2024. It is now read-only.

did not delete in original areas #1

Closed
wants to merge 17 commits into from
Closed

did not delete in original areas #1

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9f29675
did not delete in original areas
outzhu Oct 11, 2021
0eb454d
Update Dockerfile
outzhu Oct 11, 2021
dc80ed5
Update Dockerfile
outzhu Oct 11, 2021
1d0d686
new location
outzhu Oct 11, 2021
d993870
update lines
outzhu Oct 11, 2021
853ad3c
Delete Dockerfile
outzhu Oct 11, 2021
cb6fd20
Delete libnss-aad/amazon directory
outzhu Oct 11, 2021
249670c
Delete pam_aad/amazon directory
outzhu Oct 11, 2021
e27678d
deletion
outzhu Oct 11, 2021
0080e51
Merge branch 'master' of https://github.com/Ada-Codina/docker
outzhu Oct 11, 2021
b8a9cb4
line update
outzhu Oct 11, 2021
1c82aae
dockerfile updates
outzhu Oct 12, 2021
75e0f62
CHECK openvpn ubuntu, it has the new line
outzhu Oct 13, 2021
c702884
https://pkgs.org/ used for Rocky
outzhu Oct 13, 2021
e6086a5
missing packages
outzhu Oct 27, 2021
c94aad3
updates
outzhu Oct 27, 2021
73a50e8
will it run?
outzhu Oct 27, 2021
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
39 changes: 39 additions & 0 deletions libnss-aad/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
FROM alpine:3.14
ARG VERSION
ARG DEBVER
outzhu marked this conversation as resolved.
Show resolved Hide resolved

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
outzhu marked this conversation as resolved.
Show resolved Hide resolved
>> /etc/apk/repositories && \
apk update && apk add -y \
automake \


cmake \
curl \


git \
indent \

jansson-dev \

libsodium-dev \

libtool \


quilt

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /usr/src/libnss_aad
COPY . /usr/src/libnss_aad
RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -i'.git' && \
dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved
39 changes: 39 additions & 0 deletions libnss-aad/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
FROM debian:11.0
ARG VERSION
ARG DEBVER

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
>> /etc/apt/sources.list && \
apt update && apt install -y \
automake \
autopoint \
build-essential \
cmake \
curl \
debhelper \
devscripts \
git \
indent \
libcurl4-openssl-dev \
libjansson-dev \
libjwt-dev \
libsodium-dev \
libssl-dev \
libtool \
libxcrypt-dev \
pkg-config \
quilt

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"

WORKDIR /usr/src/libnss_aad
COPY . /usr/src/libnss_aad
RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -i'.git' && \
dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
40 changes: 40 additions & 0 deletions libnss-aad/rocky/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
FROM rockylinux/rockylinux:8.4
ARG VERSION
ARG DEBVER

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
>> /etc/dnf/dnf.conf && \
dnf update && dnf install -y \
automake \


cmake \
curl \


git \
indent \
libcurl-devel \
jansson-devel \



libtool \
libxcrypt-devel \

quilt

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
oxr463 marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /usr/src/libnss_aad
COPY . /usr/src/libnss_aad
RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -i'.git' && \
dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for Debian. Rocky is similar to Amazon Linux. Check how I did it there, https://github.com/aad-for-linux/pam_aad/blob/master/docker/amazon/Dockerfile#L36

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

RUN make depends && \
    LIB_DIR=/lib64 make -e install

for libnss_aad
https://github.com/aad-for-linux/libnss-aad/blob/master/docker/amazon/Dockerfile

and for pam_aad

RUN ./bootstrap.sh && \
    ./configure --with-pam-dir="${PAMROC}" && \
    make && make install

left openvpn-auth-aad alone for now


70 changes: 70 additions & 0 deletions libnss-aad/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
FROM ubuntu:20.04
ARG VERSION
ARG DEBVER

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
>> /etc/apt/sources.list && \
apt update && apt install -y \
automake \
autopoint \
build-essential \
cmake \
curl \
debhelper \
devscripts \
git \
indent \
libcurl4-openssl-dev \
libjansson-dev \
libjwt-dev \
libsodium-dev \
libssl-dev \
libtool \
libxcrypt-dev \
pkg-config \
quilt

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"

WORKDIR /usr/src/libnss_aad
COPY . /usr/src/libnss_aad
RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -i'.git' && \
dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
RUN apt update && apt install -y \
software-properties-common && \
add-apt-repository -y ppa:lramage/sds && \
add-apt-repository -y ppa:jnchi/ppa

RUN apt update && apt install -y \
automake \
autopoint \
build-essential \
cmake \
curl \
debhelper \
devscripts \
git \
indent \
libcurl4-openssl-dev \
libjansson-dev \
libjwt-dev \
libsds-dev \
libsodium-dev \
libssl-dev \
libtool \
libxcrypt-dev \
pkg-config \
quilt

WORKDIR /usr/src/libnss_aad
COPY . /usr/src/libnss_aad
RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -i'.git' && \
dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
18 changes: 18 additions & 0 deletions openvpn-auth-aad/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM aad-for-linux/pam_aad:alpine
ARG VERSION
ARG DEBVER
outzhu marked this conversation as resolved.
Show resolved Hide resolved

RUN apk update -qq && apk add -y \
liblz4-dev \
liblzo2-dev \
openvpn \
wget

WORKDIR /usr/src/openvpn-auth-aad
COPY . /usr/src/openvpn-auth-aad
RUN useradd -m dev -s /bin/bash && \
chown -R dev:dev /usr/src/openvpn-auth-aad

RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../openvpn-auth-aad_${VERSION}-${DEBVER}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved
19 changes: 19 additions & 0 deletions openvpn-auth-aad/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM aad-for-linux/pam_aad:debian
ARG VERSION
ARG DEBVER

RUN apt-get update -qq && apt-get install -y \
liblz4-dev \
liblzo2-dev \
openvpn \
wget

WORKDIR /usr/src/openvpn-auth-aad
COPY . /usr/src/openvpn-auth-aad
RUN useradd -m dev -s /bin/bash && \
chown -R dev:dev /usr/src/openvpn-auth-aad

RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../openvpn-auth-aad_${VERSION}-${DEBVER}_amd64.deb"

18 changes: 18 additions & 0 deletions openvpn-auth-aad/rocky/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM aad-for-linux/pam_aad:rocky
ARG VERSION
ARG DEBVER
outzhu marked this conversation as resolved.
Show resolved Hide resolved

RUN dnf update -qq && dnf install -y \
liblz4-dev \
liblzo2-dev \
openvpn \
wget

WORKDIR /usr/src/openvpn-auth-aad
COPY . /usr/src/openvpn-auth-aad
RUN useradd -m dev -s /bin/bash && \
chown -R dev:dev /usr/src/openvpn-auth-aad

RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../openvpn-auth-aad_${VERSION}-${DEBVER}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved
19 changes: 19 additions & 0 deletions openvpn-auth-aad/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM openvpn_auth_aad/ubuntu/Dockerfile
ARG VERSION
ARG DEBVER

RUN apt-get update -qq && apt-get install -y \
liblz4-dev \
liblzo2-dev \
openvpn \
wget

WORKDIR /usr/src/openvpn-auth-aad
COPY . /usr/src/openvpn-auth-aad
RUN useradd -m dev -s /bin/bash && \
chown -R dev:dev /usr/src/openvpn-auth-aad

RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../openvpn-auth-aad_${VERSION}-${DEBVER}_amd64.deb"

38 changes: 38 additions & 0 deletions pam_aad/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM alpine:3.14
ARG VERSION
ARG DEBVER
outzhu marked this conversation as resolved.
Show resolved Hide resolved

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
outzhu marked this conversation as resolved.
Show resolved Hide resolved
>> /etc/apk/repositories && \
apk update && apk add -y \
automake \
build-essential \
curl \
debhelper \
devscripts \
git \
indent \
libcurl4-openssl-dev \
libjansson-dev \
libjwt-dev \
libpam0g-dev \
libssl-dev \
libtool \
pkg-config \
quilt \
uuid-dev

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /usr/src/pam_aad
COPY . /usr/src/pam_aad
RUN tar cvzf "../pam-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../libpam-aad_${VERSION}-${DEBVER}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved

37 changes: 37 additions & 0 deletions pam_aad/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
FROM debian:11.0
ARG VERSION
ARG DEBVER

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
>> /etc/apt/sources.list && \
apt update && apt install -y \
automake \
build-essential \
curl \
debhelper \
devscripts \
git \
indent \
libcurl4-openssl-dev \
libjansson-dev \
libjwt-dev \
libpam0g-dev \
libssl-dev \
libtool \
pkg-config \
quilt \
uuid-dev

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"

WORKDIR /usr/src/pam_aad
COPY . /usr/src/pam_aad
RUN tar cvzf "../pam-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../libpam-aad_${VERSION}-${DEBVER}_amd64.deb"
37 changes: 37 additions & 0 deletions pam_aad/rocky/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
FROM rockylinux/rockylinux:8.4
ARG VERSION
ARG DEBVER
outzhu marked this conversation as resolved.
Show resolved Hide resolved

RUN echo "deb http://http.us.debian.org/debian bullseye main" \
outzhu marked this conversation as resolved.
Show resolved Hide resolved
>> /etc/dnf/dnf.conf && \
dnf update && dnf install -y \
automake \
build-essential \
curl \
debhelper \
devscripts \
git \
indent \
libcurl4-openssl-dev \
libjansson-dev \
libjwt-dev \
libpam0g-dev \
libssl-dev \
libtool \
pkg-config \
quilt \
uuid-dev

ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
WORKDIR /tmp
RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
Comment on lines +13 to +19
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to port SDS since we can't use the Debian package.


WORKDIR /usr/src/pam_aad
COPY . /usr/src/pam_aad
RUN tar cvzf "../pam-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
debuild -us -uc -d -i'(.*)' && \
dpkg -i "../libpam-aad_${VERSION}-${DEBVER}_amd64.deb"
outzhu marked this conversation as resolved.
Show resolved Hide resolved
Loading