Skip to content

Commit 055a389

Browse files
fossamfossam
committed
Replace COPY with ADD
1 parent 4fab106 commit 055a389

File tree

8 files changed

+24
-56
lines changed

8 files changed

+24
-56
lines changed

‎pkg/amazonlinux2016.09/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ RUN yum makecache fast && yum -y update
1616
#paths that hubble or hubble parts need in the package
1717
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1818

19-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
19+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2020
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
21-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
22-
RUN cd /opt/osquery \
23-
&& tar xf "$OSQUERY_TAR_FILENAME" \
24-
&& rm -f "$OSQUERY_TAR_FILENAME" \
25-
&& cd / \
26-
&& /opt/osquery/osqueryi --version
21+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
22+
RUN /opt/osquery/osqueryi --version
2723

2824
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
2925
RUN yum -y install git \

‎pkg/centos6/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ RUN yum makecache fast && yum -y update
1616
#paths that hubble or hubble parts need in the package
1717
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1818

19-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
19+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2020
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
21-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
22-
RUN cd /opt/osquery \
23-
&& tar xf "$OSQUERY_TAR_FILENAME" \
24-
&& rm -f "$OSQUERY_TAR_FILENAME" \
25-
&& cd / \
26-
&& /opt/osquery/osqueryi --version
21+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
22+
RUN /opt/osquery/osqueryi --version
2723

2824
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
2925
RUN yum -y install git \

‎pkg/centos7/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ RUN yum makecache fast && yum -y update
1616
#paths that hubble or hubble parts need in the package
1717
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1818

19-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
19+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2020
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
21-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
22-
RUN cd /opt/osquery \
23-
&& tar xf "$OSQUERY_TAR_FILENAME" \
24-
&& rm -f "$OSQUERY_TAR_FILENAME" \
25-
&& cd / \
26-
&& /opt/osquery/osqueryi --version
21+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
22+
RUN /opt/osquery/osqueryi --version
2723

2824
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
2925
RUN yum -y install git \

‎pkg/centos8/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ RUN dnf -y update
1616
#paths that hubble or hubble parts need in the package
1717
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1818

19-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
19+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2020
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
21-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
22-
RUN cd /opt/osquery \
23-
&& tar xf "$OSQUERY_TAR_FILENAME" \
24-
&& rm -f "$OSQUERY_TAR_FILENAME" \
25-
&& cd /
26-
# && /opt/osquery/osqueryi --version
21+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
22+
RUN /opt/osquery/osqueryi --version
2723

2824
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
2925
RUN dnf -y install git \

‎pkg/coreos/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ RUN apt-get update \
1717
#paths that hubble or hubble parts need in the package
1818
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1919

20-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
20+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2121
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
22-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
23-
RUN cd /opt/osquery \
24-
&& tar xf "$OSQUERY_TAR_FILENAME" \
25-
&& rm -f "$OSQUERY_TAR_FILENAME" \
26-
&& cd / \
27-
&& /opt/osquery/osqueryi --version
22+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
23+
RUN /opt/osquery/osqueryi --version
2824

2925
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
3026
RUN apt-get -y install git curl \

‎pkg/debian10/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ RUN apt-get update \
1717
#paths that hubble or hubble parts need in the package
1818
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1919

20-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
20+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2121
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
22-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
23-
RUN cd /opt/osquery \
24-
&& tar xf "$OSQUERY_TAR_FILENAME" \
25-
&& rm -f "$OSQUERY_TAR_FILENAME" \
26-
&& cd / \
27-
&& /opt/osquery/osqueryi --version
22+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
23+
RUN /opt/osquery/osqueryi --version
2824

2925
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
3026
RUN apt-get -y install git curl \

‎pkg/debian8/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ RUN apt-get update \
1717
#paths that hubble or hubble parts need in the package
1818
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1919

20-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
20+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2121
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
22-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
23-
RUN cd /opt/osquery \
24-
&& tar xf "$OSQUERY_TAR_FILENAME" \
25-
&& rm -f "$OSQUERY_TAR_FILENAME" \
26-
&& cd / \
27-
&& /opt/osquery/osqueryi --version
22+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
23+
RUN /opt/osquery/osqueryi --version
2824

2925
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
3026
RUN apt-get -y install git curl \

‎pkg/debian9/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ RUN apt-get update \
1717
#paths that hubble or hubble parts need in the package
1818
RUN mkdir -p /etc/hubble/hubble.d /opt/hubble /opt/osquery /var/log/hubble_osquery/backuplogs
1919

20-
#copy in and process osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
20+
#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
2121
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
22-
COPY ${OSQUERY_TAR_FILENAME} /opt/osquery/${OSQUERY_TAR_FILENAME}
23-
RUN cd /opt/osquery \
24-
&& tar xf "$OSQUERY_TAR_FILENAME" \
25-
&& rm -f "$OSQUERY_TAR_FILENAME" \
26-
&& cd / \
27-
&& /opt/osquery/osqueryi --version
22+
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
23+
RUN /opt/osquery/osqueryi --version
2824

2925
#install packages that should be needed for ligbit2 compilation and successful pyinstaller run
3026
RUN apt-get -y install git curl \

0 commit comments

Comments
 (0)