Merge branch 'armhf-new' into armhf-cross

# Conflicts: # Dockerfile
bump alpine to 3.8
2025-11-07 04:28:26 +00:00 · 2020-08-11 13:00:34 +03:00 · 2018-07-19 13:57:34 +03:00 · 2018-07-19 13:56:26 +03:00 · 2018-02-28 21:52:54 +03:00 · 2018-02-28 13:18:03 +03:00
6 changed files with 18 additions and 20 deletions
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -5,6 +5,7 @@ on:
    # Publish `master` as Docker `latest` image.
    branches:
      - master
+      - armhf-cross
    
    # Publish `v1.2.3` tags as releases.
    tags:
--- a/20
+++ b/20
@@ -1,8 +1,10 @@
-FROM --platform=linux/armhf alpine:3.12.0 as build
+FROM b4tman/armhf-alpine-qemu:latest as build

 ENV SQUID_VER 4.12
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E

+RUN [ "cross-build-start" ]
+
 RUN set -x && \
 	apk add --no-cache  \
 		gcc \
@@ -97,15 +99,19 @@ RUN set -x && \
 	cd /tmp/build && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
-
-RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
-RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf

-FROM --platform=linux/armhf alpine:3.12.0
+RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
+RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
+
+RUN [ "cross-build-end" ]
+
+FROM b4tman/armhf-alpine-qemu:latest
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

+RUN [ "cross-build-start" ]
+
 RUN set -x && \
 	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
 	addgroup -S squid -g 3128 && adduser -S -u 3128 -G squid -g squid -H -D -s /bin/false -h /var/cache/squid squid
@@ -139,7 +145,9 @@ RUN	set -x && \
 	apk add --no-cache --virtual .tz alpine-conf tzdata && \ 
 	/sbin/setup-timezone -z $TZ && \
 	apk del .tz 	
-	
+
+RUN [ "cross-build-end" ]
+
 VOLUME ["/var/cache/squid"]	
 EXPOSE 3128/tcp

--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![](https://images.microbadger.com/badges/image/b4tman/squid:armhf.svg)](https://microbadger.com/images/b4tman/squid:armhf "Get your own image badge on microbadger.com")
+[![](https://images.microbadger.com/badges/image/b4tman/squid:armhf-cross.svg)](https://microbadger.com/images/b4tman/squid:armhf "Get your own image badge on microbadger.com")
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=b4tman/docker-squid)](https://dependabot.com)
 ![Docker Build Status](https://img.shields.io/docker/build/b4tman/squid)
 ![Docker Image CI Status](https://github.com/b4tman/docker-squid/workflows/Docker%20Image%20CI/badge.svg)
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,11 +0,0 @@
-version: '2'
-services:
-  proxy:
-    build: .
-  sut:
-    image: alpine:3.10.1
-    links: 
-      - proxy
-    depends_on:
-      - proxy
-    command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  squid:
-    image: 'b4tman/squid:armhf'
+    image: 'b4tman/squid:armhf-cross'
    container_name: 'my-squid'
    restart: always
    ports:
--- a/ssl-bump/Dockerfile
+++ b/ssl-bump/Dockerfile
@@ -1,4 +1,4 @@
-FROM b4tman/squid:armhf
+FROM b4tman/squid:armhf-cross

 USER root
 CMD ["sh", "-c", "(test -d /var/cache/squid/ssl_db || /usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB) && /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
Author	SHA1	Message	Date
Dmitry Belyaev	9dab1b00cf	Merge branch 'armhf-new' into armhf-cross # Conflicts: # Dockerfile	2020-08-11 13:00:34 +03:00
Dmitry	9d46731628	bump alpine to 3.8 (cherry picked from commit `d5cbd68b4d`)	2018-07-19 13:57:34 +03:00
Dmitry	323e4533e7	bump to 3.5.28 (cherry picked from commit `9e6ed88e57`)	2018-07-19 13:56:26 +03:00
Dmitry	a83166d95e	fix second FROM	2018-02-28 21:52:54 +03:00
Dmitry	d040773634	fix build error "Address not available" (cherry picked from commit `a3b384fd87`)	2018-02-28 13:18:03 +03:00
Dmitry	e3a188f419	MAINTAINER removed	2018-02-28 13:10:33 +03:00
Dmitry	f37e4a4dfd	bump alpine to 3.7 (cherry picked from commit `6996f4b15d`)	2018-02-28 13:09:53 +03:00
Dmitry	158d177c51	MAINTAINER removed (cherry picked from commit `6f69039cbb`)	2018-02-28 13:04:12 +03:00
Dmitry	2bd558e146	multi-stage build (cherry picked from commit `dcb8862e75`)	2018-02-28 13:03:14 +03:00
Dmitry	27509b05f6	parallel compile jobs	2017-09-21 10:50:41 +03:00
Dmitry	6f138189ff	update README (cherry picked from commit `2c8641472e`)	2017-09-20 13:54:17 +03:00
Dmitry	b5974723e8	bump squid to 3.5.27 (cherry picked from commit `cbce834670`)	2017-09-20 13:31:16 +03:00
Dmitry	0ba2814cd6	Merge branch 'master' into armhf-cross	2017-07-04 09:59:24 +03:00
Dmitry	9315ec46b5	bump b4tman/armhf-alpine-qemu to 3.6	2017-07-03 14:07:35 +03:00
Dmitry	8e5308aadf	update to 3.5.26 Merge branch 'master' into armhf-cross	2017-06-06 19:40:43 +03:00
Dmitry	9d4c361f88	ignore apk errors (from post-install triggers)	2017-05-12 15:13:40 +03:00
Dmitry	80bc95d75b	Merge branch 'armhf' into armhf-cross # Conflicts: # Dockerfile	2017-05-12 11:23:07 +03:00
Dmitry Belyaev	cab0b65ef3	cross build using qemu	2017-03-07 21:03:51 +03:00